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