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