OSDN Git Service

Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
authorhughchen <hughchen@google.com>
Thu, 17 May 2018 09:13:22 +0000 (02:13 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 May 2018 09:13:22 +0000 (02:13 -0700)
commit32b1a4129ec7b6936a22194854c290021213e19a
tree163b7b332e80c6ffa37b1f05fa8aa8244d3f0d37
parent1e1b265e9c4950a834c2e5fc6be97c8fe49426e4
parent273faa216ebb2ad7d10bbe31144df501cebd28ea
Merge "Bluetooth and NFC added back to Connection preferences" into pi-dev
am: 273faa216e

Change-Id: I01c054196b04b66677708711be0d298ef2c24041