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:
65f1a4c
93d9ac2
)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev...
author
Beverly Tai
<beverlyt@google.com>
Thu, 19 Oct 2017 03:06:40 +0000
(
03:06
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 19 Oct 2017 03:06:40 +0000
(
03:06
+0000)
am:
93d9ac257d
-s ours
Change-Id: Ic1a98303821102d3cddbdbf52b98f2739c2507f6
Trivial merge