diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-14 15:10:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 15:10:05 +0000 |
| commit | 2435c816d82862b1dd288091edecac8286604850 (patch) | |
| tree | afcb1b167f48adb6d377c2ec134a5bdc617f899b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 95dd448a5ee55a59c7ea5e60eeeb03dd4a324a44 (diff) | |
| parent | a126d94892655e07f69248f67baaf90d9d25c2ee (diff) | |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61
am: a126d94892 -s ours
Change-Id: Iafccd7ef757e1b858a58ce31df55f0f0b545903f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions