diff options
| author | Geoff Mendal <mendal@google.com> | 2016-02-03 17:17:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-02-03 17:17:01 +0000 |
| commit | ff636405269e220d7e3e9419149328752b432852 (patch) | |
| tree | a5198b9ca6dcc2973a15168eade115f11ad6f403 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 501fde65b595a15c050469ba2bde250c3dfb940d (diff) | |
| parent | f322b4602893a9cb3eae30ac0f4f196b3dc95176 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 8152fbd7e9 -s ours
am: f322b46028 -s ours
* commit 'f322b4602893a9cb3eae30ac0f4f196b3dc95176':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions