Paul Duffin c02f6bb64b Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45 ...

am: 9250814fd2

Change-Id: Ifd924bdb62102657bf0c6d4b07ab919cf0f96c0c

2017-02-08 20:18:34 +00:00

..

java

Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45

2017-02-08 20:18:34 +00:00

jni

Merge "Expand seccomp whitelist" am: fd77a331eb am: 1201ce98dd

2017-02-08 20:17:35 +00:00

res

Import translations. DO NOT MERGE

2017-02-02 19:15:46 -08:00

tests

Merge "Replace com.android.internal.util.Predicate with java.util.function.Predicate" am: 78a20be77a am: 9e99b9ee45

2017-02-08 20:18:34 +00:00