diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 15:04:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 15:04:11 +0000 |
| commit | 615480f079a799179afad3d1b7c166cf2fd85e92 (patch) | |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d /rs/java/android/renderscript/ProgramStore.java | |
| parent | 1910bc6d9b7e9c7d669ec619da92c083fb547ed9 (diff) | |
| parent | 8c30514c0edd3ba244d842f11e2887d27dceaa95 (diff) | |
am 8c30514c: (-s ours) am d412cc05: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '8c30514c0edd3ba244d842f11e2887d27dceaa95':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions