tree 4b1a2d42581bd1eb7a38b5c9edb79deff91198ab
parent 6c12095322379effe400c51030631619d2f2a4f3
parent 81620c6d524765175c287c9fbc9b8019db1618f3
author Tina Zhou <tinazh@google.com> 1484947243 +0000
committer android-build-merger <android-build-merger@google.com> 1484947243 +0000

Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80  -s ours" into nougat-cts-dev am: 021fddf3fe  -s ours
am: 81620c6d52  -s ours

Change-Id: I110f5895a46d64c94304fd8e4b1d0e6f6da2b8e0