tree 36bea632b0738a96d6338aebc4512c2c4b3bb9fc
parent 09ad291b6f843562f76ae425b67ef33f0ab63fc6
parent a16bdbe070593d28a68c340d1bd6a0ac612cc321
author Android Merger <android-build-merger@google.com> 1500325402 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1500325402 +0000

Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa  -s ours" into nougat-cts-dev