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