| commit | 40eca2c91a78ff95325c4865fd09a0669d500537 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Mar 24 22:54:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 22:54:33 2014 +0000 |
| tree | a55af399f824309c762694b109d7515b095c5e66 | |
| parent | 0830ad47f790fea658ddc6fa857fb36880e0c552 [diff] | |
| parent | 2e3eaf6c4524623ed356eed5a429dfc17992caa7 [diff] |
am 2e3eaf6c: am 0b151acc: am 335a8a6c: resolved conflicts for merge of f4471c7e to klp-modular-dev * commit '2e3eaf6c4524623ed356eed5a429dfc17992caa7': DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan