diff options
| author | Baligh Uddin <baligh@google.com> | 2015-11-05 20:02:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-05 20:02:12 +0000 |
| commit | 251427a38785144d80374c64fc0e020bf661e95f (patch) | |
| tree | b2666280aa1029e5a594fbef024520b211ff45f1 /rs/java/android/renderscript/Program.java | |
| parent | 2fd15d5e8c7dbefb49434670cc76a5b94899114c (diff) | |
| parent | 6be193d87e4d7e1d517c9066bd8e4e7579384980 (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 6be193d87e -s ours
* commit '6be193d87e4d7e1d517c9066bd8e4e7579384980':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions