diff options
| author | Baligh Uddin <baligh@google.com> | 2014-02-20 18:36:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 18:36:38 +0000 |
| commit | 4292ce5d0023551a6fa7a02b284bf9b02823b06b (patch) | |
| tree | 1c7669753ee3355ffc7a699a225cf5afda97794c /rs/java/android/renderscript/RenderScript.java | |
| parent | c9443fc54caa789c4e3c64e7d9feaee8ac00506f (diff) | |
| parent | 810267c309f018c5b58b0a2e787b8a6434faa0e0 (diff) | |
am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '810267c309f018c5b58b0a2e787b8a6434faa0e0':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions