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