OSDN Git Service

Merge "Bluetooth: service for pairing notification" am: 7dfc705ad9 am: 7b9f96983d
authorMarie Janssen <jamuraa@google.com>
Thu, 23 Feb 2017 22:01:15 +0000 (22:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 23 Feb 2017 22:01:15 +0000 (22:01 +0000)
commit37e7c0eb4cd9d6d3fb7a8497f62d19d126f26fa4
tree5b4b37c5d3df1020feece5fd6350e63a788aa0d0
parentd86a16f4816ad3cf6710bd7c5f248699023c092d
parentdd0c9e62656580f61283af84214a8bd12bde2c5f
Merge "Bluetooth: service for pairing notification" am: 7dfc705ad9 am: 7b9f96983d
am: dd0c9e6265

Change-Id: Ifb9bc78d4e9569248c5ed97facad33b6aa1170c4
AndroidManifest.xml