OSDN Git Service

Merge "Don't wait for Bluetooth when shutting down" am: d9b3322e88
authorMyles Watson <mylesgw@google.com>
Wed, 10 Jan 2018 19:32:21 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Jan 2018 19:32:21 +0000 (19:32 +0000)
commit51019ab1d5ecebc3cfcf945b80159db3a063c378
tree97f5f9928ecc68613fe6e4e9dd1793e367e3808e
parent35abe14435a3229a6b70020b2dcb01cb319178e4
parent9ae00d9d9a68e2a7923a784c6a777a8a1d257028
Merge "Don't wait for Bluetooth when shutting down" am: d9b3322e88
am: 9ae00d9d9a

Change-Id: I005548cc409547cc6bdb7182c6d9ea52b4a4a46d