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