summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-09-14 14:50:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-14 14:50:33 +0000
commit0bf81b63f9e83c9e049b33bb6cb45a75814ac49c (patch)
treeeafeb074a015af69c23aab04dc223bddf3c33428
parent6cd11423600f7e87f6f0463f87ab28ae177c104b (diff)
parent9a74d618c2055f0e02e2d6b57745fa021a87b997 (diff)
downloadbase-0bf81b63f9e83c9e049b33bb6cb45a75814ac49c.tar.gz
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92
am: 9a74d618c2 Change-Id: If044222a2428095f3faa492f72d39acbb0db5bd3
0 files changed, 0 insertions, 0 deletions