| commit | a9d1e2a92239aad4712d8141fbafb4a22e350544 | [log] [tgz] |
|---|---|---|
| author | Ruchi Kandoi <kandoiruchi@google.com> | Tue Jan 09 00:01:09 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 09 00:01:09 2018 +0000 |
| tree | 5db4def7f56fcc20c515b9c31337d686ff9cbd04 | |
| parent | 28dd9dfeb541b24458e0cb66035ae978a4d281ef [diff] | |
| parent | 5d286326b15171d6a8a54d9fbc0e928fb06ef6bd [diff] |
Merge "Don't wait for NFC when shutting down." am: 5d286326b1 Change-Id: Ie1a26e5b7905fc7b1a6dbe0e1ee8f80c1030d1cc