| commit | 1476e4646b23831205df7bd50bb69eabde3ef651 | [log] [tgz] |
|---|---|---|
| author | Marcus Hagerott <mhagerott@google.com> | Thu Nov 10 11:29:15 2016 -0800 |
| committer | Marcus Hagerott <mhagerott@google.com> | Thu Nov 10 11:29:15 2016 -0800 |
| tree | 6d750fadd62e0c45db608e767054a76a9a0a010c | |
| parent | 492b32b23921b7247261c9a3864aefdcaf3c3077 [diff] | |
| parent | f7d9f91c64713483661a631599fcff6d444a207e [diff] |
resolve merge conflicts of f7d9f91 to ub-contactsdialer-master-dev Change-Id: I3e8e1b3647a8312f5055063a7047260e8d67bcc2