| commit | 841940be1cebd7a650001725d900d04648bc5bc9 | [log] [tgz] |
|---|---|---|
| author | Pawin Vongmasa <pawin@google.com> | Fri Aug 10 14:30:13 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 10 14:30:13 2018 -0700 |
| tree | 7cfa51666240c5eae2683d9c121c1dd9c16b0464 | |
| parent | 92dc397252405b07e7ea0f921b875f97095600bf [diff] | |
| parent | c0243f2ff85d3d8d897f34d063177169e736a500 [diff] |
resolve merge conflicts of b92f1d2e1be35b331b18589a8cde81d51ddd31d6 to oreo-mr1-vts-dev am: c0243f2ff8 Change-Id: I25bf6387a074f630cc3e10c3b265d16390e39eca