diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-27 00:43:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-27 00:43:57 +0000 |
| commit | 9dbedf7beab43c75278172fc71fd2dcea9eaa19b (patch) | |
| tree | c4139c8d991713b44d1b46903603dd1fa32197bb /rs/java/android/renderscript/RenderScript.java | |
| parent | 037250261f25a060c1a8ff3fd72d2967f1e9f6f4 (diff) | |
| parent | ee13d90c18392524d7d9f83216573e334095fdb1 (diff) | |
am ee13d90c: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit 'ee13d90c18392524d7d9f83216573e334095fdb1':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions