| commit | d7e5947c62e55aef973b5a31354a343fe3ee55b1 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Thu Mar 20 21:05:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 21:05:03 2014 +0000 |
| tree | de85f882636581e4c394428ff9cd1b83cabc64fa | |
| parent | e72cb4b0ed7ca3a3fd021c53318079b0a4ba61e7 [diff] | |
| parent | 323d8ef30a7dea00f524338f119af4ddbd38db3c [diff] |
am 323d8ef3: (-s ours) am 6c9385b1: am d10bc171: am 15a18d07: am da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev * commit '323d8ef30a7dea00f524338f119af4ddbd38db3c': DO NOT MERGE: Add status callback for start/stop advertising.