| commit | 84ec4fbf7b3be8bbf51c775de5dd4f4db549100f | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Wed Feb 24 20:22:09 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 24 20:22:09 2016 +0000 |
| tree | c23bc9324a200ea1aef432a78aea32a70160c57c | |
| parent | c949673876dd0be38afc7d38ab1a58e5993f727c [diff] | |
| parent | 1cba33abf35159928e065ca933dfbe67189215a7 [diff] |
resolve merge conflicts of e6c7c8e8f2 to cw-e-dev am: dfd4b8b25c am: 1cba33abf3 * commit '1cba33abf35159928e065ca933dfbe67189215a7': DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)