diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-27 23:05:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 23:05:01 +0000 |
| commit | 0b7f300a5545dc3576e74f4702bcc6b5497348f1 (patch) | |
| tree | e198352c12b2dffab88b123321bef5b4f73ec851 /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 58e99f564d552984d5088969a2aa827812db10ac (diff) | |
| parent | 852750b321c8f23c0b776a193a65d8f78afcf22b (diff) | |
am 852750b3: (-s ours) am 537ea90e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '852750b321c8f23c0b776a193a65d8f78afcf22b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions