George Mount c091a649ad Merge "Fix back stack problems due to postponed transitions" into oc-dev ...

am: ce50eb2d17

Change-Id: I8ef9d7f968541dea17198aac89441f2617fab828

2017-05-16 14:37:23 +00:00

..

java

Merge "Fix back stack problems due to postponed transitions" into oc-dev

2017-05-16 14:37:23 +00:00

jni

Merge "Set the decay timer for all forked apps." am: 232ce7868d am: 241fb2fc53

2017-05-16 14:28:00 +00:00

proto/android

strong fp lockout after 20 failed attempts

2017-05-12 13:01:01 -07:00

res

Merge "Revert "Revert "Resource ID fixup.""" into oc-dev

2017-05-16 04:00:05 +00:00

tests

Merge "Use placeholderCount-1 if using default layout." into oc-dev

2017-05-15 16:45:57 +00:00