tree 534755c823dc7cddc35fef64a562a5888818ce03
parent 9332fdb012a23df6bd7a02f3699868bcbf8889ed
parent a7055a959bfc16d9105f4d5d342652de6e3b495a
author agowdra <agowdra@google.com> 1526344064 -0700
committer android-build-merger <android-build-merger@google.com> 1526344064 -0700

Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r22" into nougat-cts-dev am: 722af5da9e  -s ours" into nougat-mr1-cts-dev
am: a7055a959b  -s ours

Change-Id: I295db9cb183cac794f9f4e69fb2dc08ebaf4ab12