Michael Kwan a26e371c9b Merge "Only modify window layout params when necessary." into cw-f-dev ...

am: 9fbd981f23

Change-Id: I36aa427a3023dcba2a29eccfc0b7aac43748e534

2017-02-14 00:55:32 +00:00

..

java

Merge "Only modify window layout params when necessary." into cw-f-dev

2017-02-14 00:55:32 +00:00

jni

Merge "Expand seccomp whitelist" am: c6c11723cb

2017-02-10 21:22:25 +00:00

res

Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91

2017-02-01 19:49:24 +00:00

tests

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

2017-02-09 19:32:58 +00:00