diff options
author | Beverly Tai <beverlyt@google.com> | 2017-10-19 21:18:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 21:18:55 +0000 |
commit | dfbaa1fd8bc6aadd4b84a2548d17af85cca6b4cc (patch) | |
tree | fe35ca643838769dd856507bdc0ac0ebe21459ef /rs/java/android/renderscript/ProgramStore.java | |
parent | 159648d6e5f8f2faa402c2bbfe7249e3616e9489 (diff) | |
parent | f2b592726d569cd0ca6dc702def29deca593ee48 (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am: f2b592726d -s ours
Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions