| commit | 049e12f0ba4d801c9319fab5e734b2bf485076b2 | [log] [tgz] |
|---|---|---|
| author | John Shao <johnshao@google.com> | Tue Nov 08 14:44:39 2016 -0800 |
| committer | John Shao <johnshao@google.com> | Tue Nov 08 17:09:56 2016 -0800 |
| tree | d37db1b1ec70fb7a2ad50776f16035a259ddfe88 | |
| parent | 2c0f5dfa285ea0ea5b345fda4d97d02ab4e68862 [diff] | |
| parent | 5b1ffdcbc5f41189f54e69c4768e3e76ba2fce05 [diff] |
resolve merge conflicts of 5b1ffdc to ub-contactsdialer-master-dev Change-Id: I73be19a553bf9a18a5a9a9b2b83c43be810d7de7