| commit | 2de933ad74f6775add88fdb84da88152f8f3d0cf | [log] [tgz] |
|---|---|---|
| author | Anton Philippov <philippov@google.com> | Tue Jun 27 15:08:30 2017 +0100 |
| committer | Anton Philippov <philippov@google.com> | Tue Jun 27 15:08:30 2017 +0100 |
| tree | ccc6563a1b5698a209387650c4e18ebd0ea60015 | |
| parent | 89b9d4f6e982a923ec8ef9dbb81cc3a399ee514e [diff] | |
| parent | 0065752727368d988bf25497578812268e98bb83 [diff] |
resolve merge conflicts of 0065752727 to oc-dr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I91af45d7399c24a02307be539433bbf44b9fcac9