George Mount beece1ae4b Merge "Fix back stack problems due to postponed transitions" into oc-dev am: ce50eb2d17 ...

am: c091a649ad

Change-Id: If14705a262ea3ee35d626f7e3d2deb6ddc035682

2017-05-16 14:47:40 +00:00

..

java

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

2017-05-16 14:47:40 +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