OSDN Git Service

Merge "Gradually increase the level of authentication on failed GATT operations....
authorJacky Cheung <jackyc@google.com>
Thu, 20 Oct 2016 21:29:45 +0000 (21:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 21:29:45 +0000 (21:29 +0000)
am: 8167362bab

Change-Id: I437b4df98f960426836536e96cdc33458162f649


Trivial merge