songjinshi 36bcc913f7 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 ...

am: ec69bd0aa3

Change-Id: Idfe455733dd12bf82c31cb505681e4fa89d57bfb

2017-02-08 20:22:26 +00:00

..

java

Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85

2017-02-08 20:22:26 +00:00

jni

Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85

2017-02-08 20:22:26 +00:00

res

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

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

tests

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

2017-02-08 18:30:17 +00:00