OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df86ddb ca37d9f)
Merge "Don't wait for NFC when shutting down." am: 5d286326b1 am: a9d1e2a922
authorRuchi Kandoi <kandoiruchi@google.com>
Tue, 9 Jan 2018 20:42:02 +0000 (20:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Jan 2018 20:42:02 +0000 (20:42 +0000)
am: ca37d9f3dd  -s ours

Change-Id: Icb37e9f862a0d08531964e09158ee84265ccd83a


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help