diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-14 14:35:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 14:35:34 +0000 |
commit | b004901c9227e6fe3cad12f2f46055f385499fac (patch) | |
tree | 867cfe229ebab8415a4bf41b9424abec0243e4ab /rs/java/android/renderscript/ProgramStore.java | |
parent | 5252746fe0c0e489cd584bf26d4669560da4b679 (diff) | |
parent | d54bc6a90812bc1f3be7b47f1be3a1edecd76612 (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c
am: d54bc6a908 -s ours
Change-Id: Ie91e9f362cc247babdc4cfc8eee7f75b647107c2
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions