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