OSDN Git Service

am 123d77a3: resolved conflicts for merge of 4197cfdb to mnc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Tue, 23 Jun 2015 03:00:15 +0000 (03:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 23 Jun 2015 03:00:15 +0000 (03:00 +0000)
* commit '123d77a395b12463186e24b09c0cebcb3fe9f185':
  Fix the file permissions of /data/misc/bluedroid/bt_config.conf


Trivial merge