tree 358f430be2afcae317a5c8dd7181f92328d6fdb6
parent 97fb5d7c67377f01b448df8c72fec597147f14b8
parent 86d007cc5a1a2b6ab10c349270f5be4bf3db9f40
author Android Build Merger (Role) <android-build-merger@google.com> 1505460393 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505460393 +0000

Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a  -s ours am: fe5ce91c5f am: 7c8a60c3e4  -s ours am: 588c61bb06  -s ours"