tree 8180ac44c2a1ae247d61b37545f62e3454c736e2
parent dae502b127e3ac8371e94ca7684d5982934b2a7c
parent 3d9541d22ee27ca52ed98b7e68f3cd834aeea592
author Android Merger <noreply-android-build-merger@google.com> 1515439934 +0000
committer android-build-merger <android-build-merger@google.com> 1515439934 +0000

Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r12" into nougat-mr1-cts-dev am: 011dc05ac7  -s ours am: 1f67485ee7 am: 9d42bbebf9 am: e8ab742fcf  -s ours am: 2ef7db33dc am: a7fd7f2a77 am: 5788e56fd9  -s ours" am: c64a424804  -s ours
am: 3d9541d22e

Change-Id: Ied346f7dc1807736380c1acd12295211f2189cd5