| commit | 2b8dac29eb838fad7a85632c269af9d62632934f | [log] [tgz] |
|---|---|---|
| author | Evan Laird <evanlaird@google.com> | Wed Jun 28 18:00:02 2017 -0400 |
| committer | Evan Laird <evanlaird@google.com> | Wed Jun 28 18:00:02 2017 -0400 |
| tree | 24daf286d9fc86f74e044348c8d37aff5e5ad44d | |
| parent | b5e79ad0d3bd672d37e9b88b002e7ad91e358448 [diff] | |
| parent | 91870d1587486266fdace8a340cbc94e1973e354 [diff] |
resolve merge conflicts of 91870d158748 to oc-dr1-dev Test: mp sysuig; visual Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4