Jesse Hall 516274249f resolve merge conflicts of b3a1417663 to nyc-mr2-dev-plus-aosp ...

Test: mmma frameworks/base
Change-Id: I2e1e04f55d05fd8aa33da304bdb951713b37793c

2017-02-10 17:15:15 -08:00

..

java

resolve merge conflicts of b3a1417663 to nyc-mr2-dev-plus-aosp

2017-02-10 17:15:15 -08:00

jni

Merge "Expand seccomp whitelist" am: c6c11723cb am: 3b9c0fadda

2017-02-10 21:28:56 +00:00

res

Import translations. DO NOT MERGE

2017-02-09 01:57:11 -08:00

tests

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

2017-02-09 19:37:26 +00:00