| commit | c438463431b171a67b22b50886ef8dd737c44004 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Fri Mar 25 14:39:40 2016 -0700 |
| committer | Andre Eisenbach <eisenbach@google.com> | Fri Mar 25 14:39:40 2016 -0700 |
| tree | 479defebef08c774d5166703122f7d84c8e98753 | |
| parent | 5211519fa7617f3e34b214264f59157db9f495aa [diff] |
Fix more merge issues in BluetoothPbapVcardManager.java Change-Id: I901042e69b3beea93684fe1a194353664fabd0c2