tree 4f41d9dbcd5d3eb20a8d68286fa9376fc13a9d3f
parent c690bb763c12b9ae9859c850f1021430a63a834f
parent 28f32f26b7727aea8855e7e49b2fa6468d73b138
author Jeff Sharkey <jsharkey@android.com> 1512671512 +0000
committer android-build-merger <android-build-merger@google.com> 1512671512 +0000

Merge changes from topic "predicates_aosp" am: 76c275e7d3
am: 28f32f26b7

Change-Id: Ic3847aeda3c4d9d62432bf5918c83174e409b871