diff options
| author | Baligh Uddin <baligh@google.com> | 2014-03-25 17:02:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 17:02:17 +0000 |
| commit | 27f67d25c8c77e609eb523b98fd7276e0ae8e3e0 (patch) | |
| tree | 57fa2402bb8f06c553cd19c4df9e664f1490b8ba /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 77dc3c00cb102fe91634aa63edf8fbec4a5ad03f (diff) | |
| parent | 29526ccad0b67dd93eae034fa8cc80341cab69db (diff) | |
am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '29526ccad0b67dd93eae034fa8cc80341cab69db':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions