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:
0b3fd51
11a7e42
)
Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution...
author
Beverly Tai
<beverlyt@google.com>
Fri, 20 Oct 2017 01:35:34 +0000
(
01:35
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 20 Oct 2017 01:35:34 +0000
(
01:35
+0000)
am:
11a7e42c8e
-s ours
Change-Id: I867f4fbe0817122c169b946a8d5c00d662e49ef4
Trivial merge