tree 712d14724e1e298538ed96eb951614db8135fbe7
parent 71f7503d40ad9f0a026666ef7c74e62e6bdcc0f8
parent 07c57f71a185fcaf3d14d40e31086101eac12f79
author Android Merger <android-build-merger@google.com> 1460871413 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1460871413 +0000

Merge "Merge "DO NOT MERGE: Remove testDumpProtected" into lollipop-mr1-cts-dev am: 2d09388  -s ours" into marshmallow-cts-dev