diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-27 00:51:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-27 00:51:15 +0000 |
| commit | 098cb21bc9d9aaf5af584e66bdd931c04835e2fa (patch) | |
| tree | 1bf933ea1eafaf54e768c580fdda84e590c3d474 /rs/java/android/renderscript/RenderScript.java | |
| parent | ea2eed6a6560f348c1084c58a2f01b2e3394b5b6 (diff) | |
| parent | 9dbedf7beab43c75278172fc71fd2dcea9eaa19b (diff) | |
am 9dbedf7b: (-s ours) am ee13d90c: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '9dbedf7beab43c75278172fc71fd2dcea9eaa19b':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions