tree 4d69f1b869e36f7b0c26041903aafbd2c1332eeb
parent be9174c11f1a7d004b3908e26d2bce83e040b024
parent 89a16cff488bf92c1ee61656b8364ed00eecc8dd
author Tina Zhou <tinazh@google.com> 1484959239 +0000
committer android-build-merger <android-build-merger@google.com> 1484959239 +0000

Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80  -s ours am: 7f203e5d1f  -s ours am: 1795ae05dd am: e86f75e926 am: 5783ce6c82
am: 89a16cff48

Change-Id: Ic44b6220adc61c1617f202c268aab0139501d813