| commit | 418edd6ae4c8a2a59b22e5b753f7918eaa00d22f | [log] [tgz] |
|---|---|---|
| author | Insaf Latypov <saferif@google.com> | Fri Jul 07 10:53:46 2017 +0100 |
| committer | Insaf Latypov <saferif@google.com> | Fri Jul 07 11:10:34 2017 +0100 |
| tree | 1eacd4950d80eddb62874b129fe0a23366b2f761 | |
| parent | 7effd7f72b03c4af97a30f769e1146a9a5658632 [diff] | |
| parent | 7e117913a9d0e2b8a620ebae41e90c5d009c68d5 [diff] |
resolve merge conflicts of 7e117913a9 to nougat-mr1-cts-dev Change-Id: I9cc0d2130dacd484e8a216ededd0d72bfe437904