tree ed26d509a5c009edc5e4cdb1eaae67e93d6fed7f
parent b9b05fd7246eac8c58419d1a2e4c3ceac7f24edb
parent 2487908cb758ee2b948f36bc5454254abd356414
author svpawar <svpawar@google.com> 1536680447 -0700
committer android-build-merger <android-build-merger@google.com> 1536680447 -0700

Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r22" into nougat-mr1-cts-dev am: 19ee72d77c  -s ours" into oreo-cts-dev
am: 2487908cb7  -s ours

Change-Id: Ief87df0efc062191c064b788cb3ff3e2fc08f286