| commit | 0b99402f87ce1d8275dc60d98c2c12ccc0d9aceb | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Tue Aug 08 16:27:14 2017 -0400 |
| committer | Jason Monk <jmonk@google.com> | Tue Aug 08 16:27:14 2017 -0400 |
| tree | 44d98e33da54bcdb73b9a9514a52b33d158bc108 | |
| parent | 7bec053dffb90f7cd0e39eec7f56fb33d847c3eb [diff] | |
| parent | de0c539dd4f19a9a3ea849e970e0bb40ca1d0188 [diff] |
resolve merge conflicts of de0c539dd4f1 to oc-mr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I3f5eb2a0481fb09b98c0c522c82c233350c06375