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