tree d4cf19386be55e8a8c36d51ffd36557f45910674
parent c1eb54fb9c57a23a8b652cb7d12a09640d537b86
parent 739fe44016f11b4fe21d0a14b01e7996c1e84fb1
author Daniel Xie <dxie@google.com> 1431614722 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431614722 +0000

am 739fe440: am c2694d8a: am 7da24a75: am 10477190: Merge "Auto-test for BLE client." into lmp-sprout-dev automerge: d3a257e  -s ours

* commit '739fe44016f11b4fe21d0a14b01e7996c1e84fb1':