diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-23 17:25:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 17:25:22 +0000 |
| commit | 981c592d2a6eaf3e43a8cab274fbcb4c58b99eab (patch) | |
| tree | 499b3e65ac99a552e2a735e6bca318a4212536d3 /rs/java/android/renderscript/ProgramStore.java | |
| parent | c31d6b705c1dfb1f85f5cdfd54593a88c858a2c5 (diff) | |
| parent | 18daf48f1af38a75c2fb2a67204fc0852121ade2 (diff) | |
am 18daf48f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '18daf48f1af38a75c2fb2a67204fc0852121ade2':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions