tree 2051f6ee32ef9ad22c167db3d28335a2d263d0e0
parent 2b9ee48dae89b6eece95bc69ee1741ae04d754a2
parent a2c92b0b88c6d77d41144926f610f821cfaec6bd
author Paul Duffin <paulduffin@google.com> 1486668778 +0000
committer android-build-merger <android-build-merger@google.com> 1486668778 +0000

Merge "Partial Revert "Replace com.android.internal.util.Predicate with java.util.function.Predicate"" am: 621ebe692f
am: a2c92b0b88

Change-Id: I605588603280ff0b4ebc1088c6c1f1c933c1e657