| commit | 898d05a713a693670cd450ff3f50156fed2f4567 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Mon Jul 16 08:36:50 2018 -0700 |
| committer | sqian <shuoq@google.com> | Mon Jul 16 08:36:50 2018 -0700 |
| tree | aea0d7867c709d853b52bb68eceaa4263d0f333f | |
| parent | c0243f2ff85d3d8d897f34d063177169e736a500 [diff] | |
| parent | dfa79a6292a42dd8609053febd8df7d5e7d48fbf [diff] |
resolve merge conflicts of dfa79a6292a42dd8609053febd8df7d5e7d48fbf to oreo-mr1-vts-dev Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I10919718b841fdb33ab0e873d1b4bbd787fafcd2