songjinshi 78a3d9dab4 Merge "[Debug]: Add timeout for dumpNativeBacktraceToFile." am: b6f7a85b85 am: ec69bd0aa3 ...

am: 36bcc913f7

Change-Id: Icf40ff98196d885e6974eb679532064b30bc68cd

2017-02-08 20:28:48 +00:00

..

java

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

2017-02-08 20:28:48 +00:00

jni

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

2017-02-08 20:28:48 +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