tree f7a2168d262d737a283a71e7006d3a50e6b6bfa5
parent a1d2ed879c917f47d11c9462e4d9e35c9a0f68f2
parent e6768bab0f6375c2fc8c438630dd59b63fe8f922
author Wei Wang <weiwa@google.com> 1394244686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394244686 +0000

am e6768bab: am b285350d: (-s ours) am b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev

* commit 'e6768bab0f6375c2fc8c438630dd59b63fe8f922':
  DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.