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