| commit | ca37d9f3dd5db0d47472855497299d4520072c02 | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Tue Jan 09 19:35:09 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 09 19:35:09 2018 +0000 |
| tree | 41d8b5f61470cc7053fabb501619249c3fd9479e | |
| parent | 658e7119a6c7d605f4238844cf29809632738996 [diff] | |
| parent | a9d1e2a92239aad4712d8141fbafb4a22e350544 [diff] |
Merge "Don't wait for NFC when shutting down." am: 5d286326b1 am: a9d1e2a922 Change-Id: Idcc78ffebaa359110b85fbda8569c7dd71b3ec68