| commit | 0b151accb74f3c2cfc78ec538a11e2949efd71e1 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Mar 24 19:44:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 19:44:57 2014 +0000 |
| tree | ce98624e554819f93b1ffc411a3a37fc0971ad8b | |
| parent | a27730b49bdd3cfeeefc2efa90e3cb196800a8dd [diff] | |
| parent | 335a8a6c08abfbea29dead003b4fa95fca786ccd [diff] |
am 335a8a6c: resolved conflicts for merge of f4471c7e to klp-modular-dev * commit '335a8a6c08abfbea29dead003b4fa95fca786ccd': DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan