Christopher Ferris 060b50b028 Merge "Merge "Set the decay timer for all forked apps." am: 232ce7868d am: 241fb2fc53 am: 50ee43bbfa" into oc-dev-plus-aosp ...

am: 5deb5277f5

Change-Id: I8f96bfcb9f9126e2617d2183a08a00293a253dce

2017-05-16 14:36:35 +00:00

..

java

Merge "Fixes crash (race cond) when using toast that is immediately cancelled" into oc-dev am: 2df0155a97

2017-05-16 14:32:58 +00:00

jni

Merge "Merge "Set the decay timer for all forked apps." am: 232ce7868d am: 241fb2fc53 am: 50ee43bbfa" into oc-dev-plus-aosp

2017-05-16 14:36:35 +00:00

proto/android

Merge "strong fp lockout after 20 failed attempts" into oc-dev am: 310818ff82

2017-05-13 00:03:18 +00:00

res

Merge "Revert "Revert "Resource ID fixup.""" into oc-dev am: a11196074b

2017-05-16 05:01:08 +00:00

tests

Merge "Use placeholderCount-1 if using default layout." into oc-dev am: 260d6c6e8c

2017-05-15 16:51:41 +00:00