diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 15:03:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 15:03:33 +0000 |
| commit | a8862962d6680ce82a123f71a126973f62ea27c9 (patch) | |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d /rs/java/android/renderscript/ProgramStore.java | |
| parent | b0bdf697ca62d21353284cd2c5fcc0acd45ad52f (diff) | |
| parent | 9dd38f3f12e84399ba3c901ca94569db81a26570 (diff) | |
am 9dd38f3f: (-s ours) am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '9dd38f3f12e84399ba3c901ca94569db81a26570':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions