diff options
author | Baligh Uddin <baligh@google.com> | 2014-04-01 00:24:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-01 00:24:50 +0000 |
commit | 658e9080215ca852b15633ce4926a738ed24f9ef (patch) | |
tree | fdd64af0776bda8d0e9d1500b3b951c29d8105da /rs/java/android/renderscript/RenderScriptGL.java | |
parent | 28e68c6a78c72d1fa419eae578440add369c0d42 (diff) | |
parent | ce0854ccba6adae15cd0b1042e3ad5fb777293da (diff) |
am ce0854cc: (-s ours) am ee800b04: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'ce0854ccba6adae15cd0b1042e3ad5fb777293da':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions