diff options
| author | Geoff Mendal <mendal@google.com> | 2015-11-17 23:42:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 23:42:23 +0000 |
| commit | b33916de2ac47bc199dc6472a84953be509e9179 (patch) | |
| tree | d562f732ae37710796d4031e8305c6671592e2c9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6b4b309fa37f08e61d3df39f66caa20bc07be8ab (diff) | |
| parent | 73dedf661e8fb6ab77552a715f202dd6c602ddc5 (diff) | |
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours am: ee144ce3ba -s ours
am: 73dedf661e -s ours
* commit '73dedf661e8fb6ab77552a715f202dd6c602ddc5':
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions