diff options
author | Beverly Tai <beverlyt@google.com> | 2017-10-19 22:39:14 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-19 22:39:14 +0000 |
commit | 5fda53b294aa73304b60a6287103a6423c922cb1 (patch) | |
tree | e19bd5687deca48bb98ab968aa64afa9aed45b47 /rs/java/android/renderscript/Program.java | |
parent | d1150b7e553c2bf518c71cf25d7b698fdf6bf551 (diff) | |
parent | bcdb9079efc2a1ce3ad27e25f10d94b30a7031a0 (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours
am: bcdb9079ef
Change-Id: Id065bc6f31814aed56fce0ddd9a1b6378d9364ee
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions