OSDN Git Service

am 335a8a6c: resolved conflicts for merge of f4471c7e to klp-modular-dev
authorMatthew Xie <mattx@google.com>
Mon, 24 Mar 2014 19:44:57 +0000 (19:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Mar 2014 19:44:57 +0000 (19:44 +0000)
* commit '335a8a6c08abfbea29dead003b4fa95fca786ccd':
  DO NOT MERGE Allow simultaneous LE Observe and BTM Inquiry/Scan


Trivial merge