diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-12 16:32:29 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-12 16:32:29 +0000 |
commit | 6cd11423600f7e87f6f0463f87ab28ae177c104b (patch) | |
tree | eafeb074a015af69c23aab04dc223bddf3c33428 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 5288fcc2422f520e8b9d1afbc86aeb9fc5c05801 (diff) | |
parent | b4913b709311d3897b86a2e2e4e5338dd07f2f4b (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0
am: b4913b7093
Change-Id: Ie38994ab474ba3f8b34d3ad4dac6b6a714eb2899
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions