diff options
| author | Baligh Uddin <baligh@google.com> | 2013-11-20 13:16:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-20 13:16:20 -0800 |
| commit | b6c3d5b4ac9300fdb2902509ff485feadcae9553 (patch) | |
| tree | 31fdca54115a40f8f1ed384c000795b9316360ea /graphics/java/android/renderscript/RenderScript.java | |
| parent | 214c250354166ee783aef2ed69aa678880995f46 (diff) | |
| parent | ed95cabf4cd13febec213ad342d947c7c847180c (diff) | |
am ed95cabf: (-s ours) am bc77af5b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'ed95cabf4cd13febec213ad342d947c7c847180c':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions