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