tree 1701d232541692717a39cf6a98812fad7e9e8502
parent e3805c6144038207bc72654bd250054e5821c373
parent b285350d6580a118940a0f7d62857a199e362283
author Wei Wang <weiwa@google.com> 1394244451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394244451 +0000

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

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