tree 8f8f13cb56ca45e86238f49f91b0c9af10e6eef7
parent f0745237692e980ca44a85a0641243803160758a
parent 404b7138b2fd28a427f41ff95cd298847a8d3400
author Android Merger <android-build-merger@google.com> 1487119342 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1487119343 +0000

Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r17" into lollipop-mr1-cts-dev am: 9bb9e26289  -s ours" into marshmallow-cts-dev