diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:23:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:23:28 +0000 |
| commit | 25d12a408692f9267f20fa9b674516cf4b978331 (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1400ea56b0d935803df6f10193114c37bd4a3dcb (diff) | |
| parent | cb4bea3ae8d76b54b0d54c8ae51dd2ef7f64bbfe (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: cb4bea3ae8 -s ours
* commit 'cb4bea3ae8d76b54b0d54c8ae51dd2ef7f64bbfe':
Import translations. DO NOT MERGE
Change-Id: Ia24ecde1804a2478505923121cedf9550924752a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions