diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-14 17:40:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 17:40:12 +0000 |
| commit | ef696aa47b823d176973864a663e07da777bf6a5 (patch) | |
| tree | afcb1b167f48adb6d377c2ec134a5bdc617f899b /rs/java/android/renderscript/ProgramStore.java | |
| parent | 2435c816d82862b1dd288091edecac8286604850 (diff) | |
| parent | ba55b3bea6014ffb993eb88422290cc72104d634 (diff) | |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b
am: ba55b3bea6 -s ours
Change-Id: I0d0ce4d4a017126cb5f6cab1fbe4da2e8ba37ce9
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions