diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:13:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:13:09 +0000 |
| commit | 1400ea56b0d935803df6f10193114c37bd4a3dcb (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 479e4ebae4edf727c7b72a52f27ff8502e000672 (diff) | |
| parent | 5c2575071e95e8efbb73f1a78f8dc382eda6e453 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: a68d1f10e2 -s ours
am: 5c2575071e -s ours
* commit '5c2575071e95e8efbb73f1a78f8dc382eda6e453':
Import translations. DO NOT MERGE
Change-Id: I876ee6b17f993d8ef7ede529c8bf7118abc80439
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions