diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:33:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:33:33 +0000 |
| commit | 7333b0ddeeed5c7531cf270ce1f045f6f4cdb097 (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9c8adbb99981ecbe0368b12cbf449d9729c5c5cd (diff) | |
| parent | 25d12a408692f9267f20fa9b674516cf4b978331 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: cb4bea3ae8 -s ours
am: 25d12a4086 -s ours
* commit '25d12a408692f9267f20fa9b674516cf4b978331':
Import translations. DO NOT MERGE
Change-Id: I0b16c46e024e80f12b3690b3b4fceaa1d7cc87ba
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions