diff options
| author | Baligh Uddin <baligh@google.com> | 2014-07-06 19:45:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-06 19:45:38 +0000 |
| commit | abef99cf6a18873ff2079285d26755b41aed979b (patch) | |
| tree | 52ce1845696e788825e05127a459d7370e0efdfe /rs/java/android/renderscript/RenderScript.java | |
| parent | 11281de7a2c335ed5410fa83b275173130714f52 (diff) | |
| parent | 02c355d10b3235b73d58ab54222721e32bec3f1f (diff) | |
am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '02c355d10b3235b73d58ab54222721e32bec3f1f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions