diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:31:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:31:59 +0000 |
| commit | ee5dd4e899262f89c53b71a6f14bed53d0060426 (patch) | |
| tree | 277720002bc21c9948a2146196c64f5c66b4d49a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3e598ff5e1294276d5d6efdbee2bf706e318d547 (diff) | |
| parent | abd7b12ada0f5f1c61ef9cec2ca13e199d6b2682 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours
am: abd7b12ada -s ours
* commit 'abd7b12ada0f5f1c61ef9cec2ca13e199d6b2682':
Change-Id: I68b5d705a30392165854e9496352b12748c5942c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions