diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-02 14:22:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 14:22:52 +0000 |
| commit | e467992236a40646d31a9171ecaac51b0d90fd9a (patch) | |
| tree | cabf4a2f5dc41824a2e5083e0083189199fa43f0 /rs/java/android/renderscript/RenderScript.java | |
| parent | b77346add048f7aa776ecf55400a711598fc8aa9 (diff) | |
| parent | fe78077418982794dc4b8966e3d389ce0f7ad13c (diff) | |
am fe780774: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'fe78077418982794dc4b8966e3d389ce0f7ad13c':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions