| commit | 4d0cf0c53a8b8e331ced0874d39d6ad4a6122ffc | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Sat Mar 08 13:03:09 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 13:03:09 2014 -0800 |
| tree | 31fdf528a7f6dd1453fa2961d54400e00135e6c6 | |
| parent | 0aa4c55fb1f13970295231390027472fd7170ffe [diff] | |
| parent | 6f91cedfeba3accca5e627093b8958428d3a4edb [diff] |
am 6f91cedf: am c9d49ff0: (-s ours) am e3318add: am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev * commit '6f91cedfeba3accca5e627093b8958428d3a4edb': DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.