OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev
authorBeverly Tai <beverlyt@google.com>
Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Sep 2017 15:53:38 +0000 (15:53 +0000)
am: 89a94b706d  -s ours

Change-Id: Ibe0d0ddfa57cf5c52ff5f70c301c0e1f715e5e36


Trivial merge