diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-05-24 18:36:00 -0700 |
|---|---|---|
| committer | Pavlin Radoslavov <pavlin@google.com> | 2016-05-24 18:36:00 -0700 |
| commit | 98b1371103068383c1d719279ca52aad2fef5ad1 (patch) | |
| tree | 31efee78867471ba2b01776b4098c6545f50e51b /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 0ad887b35e763803cef0ff31c4971f7eee6ce9f8 (diff) | |
| parent | 97340071f7e408d2e3d18179cef4a10a66940e1a (diff) | |
resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp
Change-Id: I216125254d09cf00a60274f510f814ee8f1a31ba
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
0 files changed, 0 insertions, 0 deletions