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:
97bcf6e
15a1363
)
Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handov...
author
Hiroki Yamamoto
<hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 02:20:01 +0000
(
02:20
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 6 Jul 2017 02:20:01 +0000
(
02:20
+0000)
am:
15a1363463
Change-Id: Ic79ed1702bfe1e4d5737d7f3731cdade1c3b6019
Trivial merge