tree 686eb43ed670851e4efbde5a8f86aa8309b5b05d
parent ba55b3bea6014ffb993eb88422290cc72104d634
parent c8752a515963b1c8b67a553e2cb666f367743f32
author Beverly Tai <beverlyt@google.com> 1505410454 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505410454 +0000

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev