summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-09-14 15:03:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-14 15:03:04 +0000
commita126d94892655e07f69248f67baaf90d9d25c2ee (patch)
treebf19400e6e3b87f7ded336a2e31f87edea54ebd1
parent98313f599686183d2a5200eaecf1a99c6d0dc017 (diff)
parente148e39d615d7d85268dcddb37693fb4901f4d01 (diff)
downloadbase-a126d94892655e07f69248f67baaf90d9d25c2ee.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 am: 0bf81b63f9
am: e148e39d61 Change-Id: Ia19f7708f64129c5ab3fb37c516e00a81b3cfc1b
0 files changed, 0 insertions, 0 deletions