diff options
| author | Bill Yi <byi@google.com> | 2017-10-02 17:45:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-02 17:45:18 +0000 |
| commit | 899f5cf30984a3b185fd85a14793039fe3055853 (patch) | |
| tree | dde629699256a2a0410bcdd73f47d87c8f9ffed2 /rs/java/android/renderscript/Script.java | |
| parent | 595adddf1c96ad414a3edc8387bd53f64c606e5d (diff) | |
| parent | 995627c3ee75dce1ebf6338012cba60d68fe94f0 (diff) | |
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 995627c3ee -s ours
Change-Id: I1acc544f6cab8fdde4d7b66b110baf46114a3730
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions