diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:13:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:13:02 +0000 |
| commit | 650a2aad33720c0270593003c2e4078ba6d49feb (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 83680a1c3dc8aad2f7990279a1bf951cce215c5c (diff) | |
| parent | 67ae5a22517ff68547171588c09ae9ce3e95080b (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3d9d9fa0d9 -s ours
am: 67ae5a2251 -s ours
* commit '67ae5a22517ff68547171588c09ae9ce3e95080b':
Import translations. DO NOT MERGE
Change-Id: Iab1bf41b422aa0e7bd8508b2c7afb288f6413497
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions