diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-14 19:09:03 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 19:09:03 +0000 |
commit | 7c8a60c3e4171c2128821e8a6574baa2e4f36a5e (patch) | |
tree | f2f4103ac42a3eea7b66bd27da7569d0970ccd53 /rs/java/android/renderscript/ProgramStore.java | |
parent | 98e46b5bd8d314667038a1d6f3bbbbcd4334fc89 (diff) | |
parent | fe5ce91c5fff023e38395b0b4c559c6dabc21163 (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a -s ours
am: fe5ce91c5f
Change-Id: If9c65045e4810a08dc0a025ac740c5499547fd7e
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions