| commit | 178159064210465fb9afc3382f5f8d0a0208fad5 | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Sat Mar 08 11:02:08 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 08 11:02:08 2014 +0000 |
| tree | b360549535165a8fbade89737547e3470b8d07c9 | |
| parent | d35b818e4f9a7414921eb59539d7f47086cf649d [diff] | |
| parent | 2aeee06bb407b61c5e3da0da761454b404e35d3d [diff] |
am 2aeee06b: (-s ours) am fc9be0a2: am 56910cf5: (-s ours) Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev * commit '2aeee06bb407b61c5e3da0da761454b404e35d3d': DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.