OSDN Git Service

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
authorBeverly Tai <beverlyt@google.com>
Thu, 19 Oct 2017 03:06:40 +0000 (03:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 19 Oct 2017 03:06:40 +0000 (03:06 +0000)
am: 93d9ac257d  -s ours

Change-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6


Trivial merge