diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-25 15:45:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 15:45:39 +0000 |
| commit | d86a584f101a5932a8fa2b686ef052e22e004854 (patch) | |
| tree | b9e5747ef087cbb0d9a3212dbab84f8d1f7f7ed1 /rs/java/android/renderscript/RenderScript.java | |
| parent | 4c1a49fc53a6e9caacfb6d6a8c4c114c2b9a61a9 (diff) | |
| parent | 9cfd002e06c32789ae57698a2d5ca565d7128a49 (diff) | |
am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '9cfd002e06c32789ae57698a2d5ca565d7128a49':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions