diff options
| author | Baligh Uddin <baligh@google.com> | 2014-08-15 22:35:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-15 22:35:43 +0000 |
| commit | bd42c307c4c0138d36dbe22c2e1ca7e92e71b117 (patch) | |
| tree | 94f6d08290ab11bcf9cb897270fd3577fd9cdaf6 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 0039271391089eeecb990ad0e66ba6e19f24eceb (diff) | |
| parent | e2541778bfe330449612c02661257318f69916bd (diff) | |
am e2541778: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'e2541778bfe330449612c02661257318f69916bd':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions