diff options
| author | Baligh Uddin <baligh@google.com> | 2013-05-23 09:18:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-23 09:18:12 -0700 |
| commit | 5dbeb6521c8daca24c19b7b005549eb9b02e8f7a (patch) | |
| tree | b07d5e40257c014dbb080f31e0eed4548618330a /graphics/java/android/renderscript/RenderScript.java | |
| parent | 5e9fc2f0e13bc04e2e7d8f175962dadeb132d07e (diff) | |
| parent | bc25a20e3891c83e516b6e5c94b404ab85a2e150 (diff) | |
am bc25a20e: (-s ours) am a9a0409d: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'bc25a20e3891c83e516b6e5c94b404ab85a2e150':
Import translations. DO NOT MERGE
Diffstat (limited to 'graphics/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions