OSDN Git Service

Merge "Gradually increase the level of authentication on failed GATT operations....
authorJacky Cheung <jackyc@google.com>
Thu, 20 Oct 2016 23:11:51 +0000 (23:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 23:11:51 +0000 (23:11 +0000)
am: 046a5c3a00

Change-Id: I749b2e4d4a13f099cfdc164f7fec8556d09f8433


Trivial merge