diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-08 21:42:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 21:42:00 +0000 |
| commit | 3153c179d8d7f5a4dfccbc904f7ffbbc887a3a8a (patch) | |
| tree | 2d232445a4d03714ccb03cd7831373dd7e2a3395 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 2e58d6de062fc48ad2a032d90d4956cf8041a894 (diff) | |
| parent | 33c08e2986832fa32fc08350f946e7c2e8f2b3a6 (diff) | |
am 33c08e29: (-s ours) am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '33c08e2986832fa32fc08350f946e7c2e8f2b3a6':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions