OSDN Git Service

am 692e9b34: (-s ours) am 90460c79: Merge "Add more intelligence to bluetooth connect...
authorJason Monk <jmonk@google.com>
Thu, 27 Aug 2015 10:22:17 +0000 (10:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:22:17 +0000 (10:22 +0000)
* commit '692e9b3404a2ba2260fa50668fbbc76d8c874f21':


Trivial merge