diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-24 01:34:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-24 01:34:14 +0000 |
| commit | 27f285bf9e4b2bc724043b680352441580fc5e16 (patch) | |
| tree | e8d704d6fdd5942f818be9a8b07a02aa73cc85bc /rs/java/android/renderscript/RenderScript.java | |
| parent | c1885e82b6c20a2e4ae5056b5be405e070637c3f (diff) | |
| parent | abdbf1860c7855687aacbb4e293a6e6ec40c0213 (diff) | |
am abdbf186: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'abdbf1860c7855687aacbb4e293a6e6ec40c0213':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions