| commit | 9ef7b1199bec7a109d2fcaaaac66e8a8994570cf | [log] [tgz] |
|---|---|---|
| author | Yuexi Ma <yuexima@google.com> | Fri Jan 19 17:46:29 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 19 17:46:29 2018 +0000 |
| tree | 2636f3166089c95bab20f7014e17764a14b00726 | |
| parent | 7f1b1fda06902f95e81431165f9f15ead89c26c2 [diff] | |
| parent | 1993152063468555aa05fb6668d3e960b7905b1d [diff] |
resolve merge conflicts of 7468fdf605a51f376ba457a160e15ec348acde24 to oreo-mr1-vts-dev am: 1993152063 Change-Id: I03fb33e526390827671de90385691cb032ebe259