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:
f888e42
f259a19
)
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" into oc-dr1-dev
author
Hiroki Yamamoto
<hiroki.a.yamamoto@sony.com>
Thu, 6 Jul 2017 18:46:41 +0000
(18:46 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 6 Jul 2017 18:46:41 +0000
(18:46 +0000)
am:
f259a1975b
Change-Id: I89bc4bb9469a1bd316eabe22abaf7ee2c10fc02c
Trivial merge