tree a64f9fd0de570a89eac6f61a0c9db876b10ff918
parent 40088685882d0f1e87b644e1e1480755d368fb98
parent b81bdd6cbee5e0f173e8bb88331fd119562afe89
author Treehugger Robot <treehugger-gerrit@google.com> 1502245363 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1502245363 +0000

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