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)
commit6cbfe1ca0972df2d652d55d4f070718d16e14cc8
treefefa09f0a15fba79e1fb75e6d57de82ef463e9de
parent5a6698ebb17f0f555fd2d3e002fcb347b7e8e806
parent123d77a395b12463186e24b09c0cebcb3fe9f185
am 123d77a3: resolved conflicts for merge of 4197cfdb to mnc-dev-plus-aosp

* commit '123d77a395b12463186e24b09c0cebcb3fe9f185':
  Fix the file permissions of /data/misc/bluedroid/bt_config.conf