OSDN Git Service

Merge "Don't wait for NFC when shutting down." am: 5d286326b1
authorRuchi Kandoi <kandoiruchi@google.com>
Tue, 9 Jan 2018 19:35:09 +0000 (19:35 +0000)
committerandroid-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