diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:23:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:23:38 +0000 |
| commit | 1761a87f90ead50ff822e0905c836b28580e111a (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2ac7d7f022556c84d206520c3e7221cc6824ffcb (diff) | |
| parent | 3cfbe6e7eaa40f28f6550a3dcaffe7cdc6eac121 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 3cfbe6e7ea -s ours
* commit '3cfbe6e7eaa40f28f6550a3dcaffe7cdc6eac121':
Import translations. DO NOT MERGE
Change-Id: I4a2f25168a33676c7caf95765c004c71c333ecd8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions