OSDN Git Service

am bae7a4d8: (-s ours) am 58295e71: Merge "Add Null checks while processing pairing...
authorSanket Padawe <sanketpadawe@google.com>
Thu, 27 Aug 2015 06:43:56 +0000 (06:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 06:43:56 +0000 (06:43 +0000)
* commit 'bae7a4d8718eae7418b774a82a9a907a5e5a9d75':


Trivial merge