| commit | 992616d59379775b7485e9f94331311653d62271 | [log] [tgz] |
|---|---|---|
| author | Marcus Hagerott <mhagerott@google.com> | Fri Dec 02 19:50:49 2016 -0800 |
| committer | Marcus Hagerott <mhagerott@google.com> | Sat Dec 03 12:15:20 2016 -0800 |
| tree | e1c255d9ae6ea43409bf9517853cc592a03bb2b0 | |
| parent | 2b81fd26071cbc0c2af7284ff5ea8a4a42e5ebaa [diff] | |
| parent | a75206b1cba895ce629b9383e4fd0fef24049e7b [diff] |
resolve merge conflicts of a75206b to master Test: built Contacts app Change-Id: Id40b4b4eba95bd7fc5ea3d024dede169bad1d460