summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-09-14 17:21:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-14 17:21:42 +0000
commit8462da779bbe6675123985218c4bd168f8b8e1bc (patch)
tree930088a49e86268d2e550dd0c25a734cb520f041
parente148e39d615d7d85268dcddb37693fb4901f4d01 (diff)
parent0a93f42be2b0fb269218b7874d5616d3ecca98f2 (diff)
downloadbase-8462da779bbe6675123985218c4bd168f8b8e1bc.tar.gz
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours
am: 0a93f42be2 Change-Id: I2da7592547bbd1c3c028eb06360c15baf9a8c13c
0 files changed, 0 insertions, 0 deletions