commit | c0243f2ff85d3d8d897f34d063177169e736a500 | [log] [tgz] |
---|---|---|
author | Pawin Vongmasa <pawin@google.com> | Wed Jul 11 23:22:17 2018 -0700 |
committer | Pawin Vongmasa <pawin@google.com> | Wed Jul 11 23:29:14 2018 -0700 |
tree | fd09cd3ac28593b3fa9bc148d9c4b6ee0061e9e3 | |
parent | 70d13c2ad31cf8e9bcf2d9c81e0161ba3295cc1e [diff] | |
parent | b92f1d2e1be35b331b18589a8cde81d51ddd31d6 [diff] |
resolve merge conflicts of b92f1d2e1be35b331b18589a8cde81d51ddd31d6 to oreo-mr1-vts-dev Test: make vts -j123 && vts-tradefed run commandAndExit vts \ --skip-all-system-status-check \ --skip-preconditions -m VtsHalMediaOmxV1_0Host \ -l INFO Bug: 70933963 Change-Id: I38f6309b638e604403dba15fa1fe1022b298c5b2