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:
658e711
a9d1e2a
)
Merge "Don't wait for NFC when shutting down." am: 5d286326b1
author
Ruchi Kandoi
<kandoiruchi@google.com>
Tue, 9 Jan 2018 19:35:09 +0000
(19:35 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 9 Jan 2018 19:35:09 +0000
(19:35 +0000)
am:
a9d1e2a922
Change-Id: Idcc78ffebaa359110b85fbda8569c7dd71b3ec68
Trivial merge