OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
55ffaea
7b1157a
)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1...
author
Beverly Tai
<beverlyt@google.com>
Thu, 19 Oct 2017 22:20:11 +0000
(22:20 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 19 Oct 2017 22:20:11 +0000
(22:20 +0000)
am:
7b1157a92e
-s ours
Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1
Trivial merge