Paul Duffin 9e99b9ee45 Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" ...

am: 78a20be77a

Change-Id: I6f32dc27f70e4c22d25ec6bd2eec715700ebbd89

2017-02-08 18:14:50 +00:00

..

java

Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"

2017-02-08 18:14:50 +00:00

jni

Expand seccomp whitelist

2017-02-08 08:38:45 -08:00

res

Merge "Turn off Dynamic IMS switching for now"

2017-02-01 19:44:55 +00:00

tests

Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate"

2017-02-08 18:14:50 +00:00