diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-30 14:56:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-30 14:56:54 +0000 |
| commit | b64b78856cf6121e9956f8910f30656ebde5d024 (patch) | |
| tree | 1d25068c2a3fc661b98a8338a951999dca828e63 /rs/java/android/renderscript/Script.java | |
| parent | e9669588c22eeae992e6b6d237f311856e4886c2 (diff) | |
| parent | 6e22b3293298b721815b321b503cbe4ce34ae77d (diff) | |
am 6e22b329: (-s ours) am 6e6250b9: (-s ours) Import translations. DO NOT MERGE
* commit '6e22b3293298b721815b321b503cbe4ce34ae77d':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions