tree 20bdde0f9bb1bd7cdef268f32198540eb9cb98c1
parent 99979253ddb67d257bef29e06b047a877f9f5412
parent 50826c5f2efd8e301a17db2164709c12e6ff0d06
author Paul Duffin <paulduffin@google.com> 1498483288 +0000
committer android-build-merger <android-build-merger@google.com> 1498483288 +0000

Merge "Clean up Predicate related code in android.test" into oc-dev-plus-aosp
am: 50826c5f2e

Change-Id: Ica9b9b478b670ec5467732a09cf123dd63780c97