diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:05:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:05:19 +0000 |
| commit | 711de8ebe818f57aafeaa3382f5ed377783fb098 (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1c568804d4764ff1b48baf7e50edce69b7ac6726 (diff) | |
| parent | 9d41bf11dfbf2e239babedd580c2fa45aef036d7 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 9d41bf11df -s ours
* commit '9d41bf11dfbf2e239babedd580c2fa45aef036d7':
Import translations. DO NOT MERGE
Change-Id: I54cc8b7c4d7dde1567661beb2055e0c3e7011c2f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions