tree b1e81aa1f69cf81518759f6d22589e68e26e5421
parent 936034e8d54997d1ba33ecc9c0515616e1b8fed1
parent 48523104c7f58e841db58290bf1c9cdd7acb5a8b
author Treehugger Robot <treehugger-gerrit@google.com> 1534452405 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1534452405 +0000

Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r32" into marshmallow-cts-dev