| commit | caaab494156835d3dc4c91040418d10abbdfb6af | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Wed Nov 16 10:33:54 2016 -0800 |
| committer | Liisa Anttonen <liisa.anttonen@nedevicesw.com> | Tue Jan 03 09:35:35 2017 +0200 |
| tree | aca9d7d0418cb61aa97218f73224c7e03349adcb | |
| parent | 59ab39b750ce984d11f1775c09f93dd0b4d012f2 [diff] |
resolve merge conflicts of 3802db4 to mnc-dev bug:32338390 Change-Id: I304c0c8c646808e690918eae7d34f0852e2b0fa8