tree b6c6e1bec6a1b70ab1fc386fc72f656bba74bd50
parent 8accc5f62347815e5825fe67887428399639f407
parent 617f5a06be4c1aea6822a55b75d2f17a7d0672f2
author Tina Zhou <tinazh@google.com> 1479845642 +0000
committer android-build-merger <android-build-merger@google.com> 1479845642 +0000

Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r13" into marshmallow-cts-dev am: a34d54c716  -s ours" into nougat-cts-dev am: 900e4f9928  -s ours" into nyc-dev
am: 617f5a06be

Change-Id: I62521d93a2a4262e8a4f78c0654ee406adfddf82