OSDN Git Service

am d8e9a945: (-s ours) am 0d56a323: am 1d454d1b: am f677f810: Merge "DO NOT MERGE...
authorMatthew Xie <mattx@google.com>
Wed, 12 Mar 2014 17:05:47 +0000 (17:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Mar 2014 17:05:47 +0000 (17:05 +0000)
* commit 'd8e9a945b901a49fecdd6ddd5cdc874ed9b8a1e2':
  DO NOT MERGE Bluetooth: Cleanup bt_config.xml during BLE Scan


Trivial merge