| commit | d846ec8e29c46497a61fd2058a8a7e2bde48882d | [log] [tgz] |
|---|---|---|
| author | Marcus Hagerott <mhagerott@google.com> | Thu Oct 13 13:21:33 2016 -0700 |
| committer | Marcus Hagerott <mhagerott@google.com> | Thu Oct 13 13:21:33 2016 -0700 |
| tree | e6924cb5db9d24e1101f5641890e36543a4b69da | |
| parent | dba810881cc1782d2adbb40b84cd8b997edd0aab [diff] | |
| parent | da071fbbb186288a1c0363c0ecc1c3c3b1f31ed9 [diff] |
resolve merge conflicts of da071fb to ub-contactsdialer-master-dev Change-Id: I01ebd24f590843f1984186090de099648ce310eb