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