Yifan Hong 229e2d09ce Merge "android.os.HwBinder.getService() in Java respects VINTF." am: 01f374c635 am: 71e77c865b ...

am: 2e943c5379

Change-Id: Ibbf18bc51e146abef1ab211614a98ec59031b1b9

2017-02-10 18:53:07 +00:00

..

java

Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev

2017-02-10 18:43:47 +00:00

jni

Merge "android.os.HwBinder.getService() in Java respects VINTF." am: 01f374c635 am: 71e77c865b

2017-02-10 18:53:07 +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