diff options
| author | Bill Yi <byi@google.com> | 2016-09-27 07:38:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-27 07:38:25 +0000 |
| commit | fdff28dbbe6222255040615b9957d947dedeae17 (patch) | |
| tree | 48a59915a923b764c99761e55b70039668ed1caa /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bf00228d77a44d0354e9d6433d4514d2bfa94e69 (diff) | |
| parent | 348c3bdce3d2187b5e4115e70335b424779501fa (diff) | |
Merge "Import translations. DO NOT MERGE am: 8f05e63417 -s ours am: 7a45aa2cff -s ours" into nyc-mr1-dev-plus-aosp
am: 348c3bdce3 -s ours
Change-Id: I1ab8406476c6d27123ca90daf87f3334ac414d41
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions