resolve merge conflicts of e6c7c8e8f2 to cw-e-dev am: dfd4b8b25c

Browse Source

am: 1cba33abf3

* commit '1cba33abf35159928e065ca933dfbe67189215a7':
  DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

...

This commit is contained in:

Andre Eisenbach

2016-02-24 20:22:09 +00:00

committed by android-build-merger

parent c949673876 1cba33abf3

commit 84ec4fbf7b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available