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