diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-29 14:47:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 14:47:40 +0000 |
| commit | 32764d0c455561c019ba6cbfe898b954d9621f23 (patch) | |
| tree | 15d05cc8baacd8d571c05f2ea4e6811f16ce14fd /rs/java/android/renderscript/Program.java | |
| parent | bf83b39739d4d0a991d287b7d0d23eb670333aa8 (diff) | |
| parent | 32ceb174c615591a7fe5fd847da6156d29fa6472 (diff) | |
am 32ceb174: (-s ours) am b12e06a4: (-s ours) am 57327c52: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '32ceb174c615591a7fe5fd847da6156d29fa6472':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions