OSDN Git Service

resolve merge conflicts of e6c7c8e8f2 to cw-e-dev
authorAndre Eisenbach <eisenbach@google.com>
Wed, 24 Feb 2016 19:57:07 +0000 (19:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Feb 2016 19:57:07 +0000 (19:57 +0000)
commit1cba33abf35159928e065ca933dfbe67189215a7
tree907abaf0e821ba9f24bbb95497a5ef2f2ad01834
parent2fb16b066b3e4e22ee489f31f75170ebc052f0ec
parentdfd4b8b25c6454dec6d1bdc7cae4976b537fff2f
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev
am: dfd4b8b25c

* commit 'dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f':
  DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)
core/java/android/provider/Settings.java