| commit | 0dee1ec5bbaee99fbb53546c0b2487508e83c405 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Sat Mar 08 11:02:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 11:02:10 2014 +0000 |
| tree | 819ffa1194028a85b01958719adc10e5cd070c70 | |
| parent | b8183f71183a43c6917e91b10139c5a2daec4a04 [diff] | |
| parent | 35258ea5610c97881ff1223e3a0a34962219b3cc [diff] |
am 35258ea5: (-s ours) am e6768bab: am b285350d: (-s ours) am b9703de9: Merge "DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change." into klp-dev * commit '35258ea5610c97881ff1223e3a0a34962219b3cc': DO NOT MERGE BLE peripheral mode (2/4): Gatt Service Change.