summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-20 00:36:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-20 00:36:59 +0000
commitedc549d78e9b36e41ce66fcb74f35de0cbb3139c (patch)
tree81577dcae70709165a6b148f8729c9b710169695
parentfa4d0a1d80f056f0105855afdc5a5af9723b8900 (diff)
parentf2e1ef2297ce97516017364e269750238c045e5d (diff)
downloadbase-edc549d78e9b36e41ce66fcb74f35de0cbb3139c.tar.gz
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 am: 5fda53b294 am: 791d8a5b16 am: 4dd01948c1 am: 260ef208ac -s ours am: b6ecd1f88a
am: f2e1ef2297 Change-Id: I99d77a01bbd5992effb98cc2cec15a27ab78d223
0 files changed, 0 insertions, 0 deletions