| commit | 1993152063468555aa05fb6668d3e960b7905b1d | [log] [tgz] |
|---|---|---|
| author | Yuexi Ma <yuexima@google.com> | Thu Jan 18 16:05:01 2018 -0800 |
| committer | Yuexi Ma <yuexima@google.com> | Thu Jan 18 16:05:01 2018 -0800 |
| tree | 2636f3166089c95bab20f7014e17764a14b00726 | |
| parent | 7f1b1fda06902f95e81431165f9f15ead89c26c2 [diff] | |
| parent | 7468fdf605a51f376ba457a160e15ec348acde24 [diff] |
resolve merge conflicts of 7468fdf605a51f376ba457a160e15ec348acde24 to oreo-mr1-vts-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I7cd924d60059f6959e870fdfb62430d91be285f3