Robert Carr 14395f81a3 Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev ...

am: 97bcf59fce

Change-Id: If55aff3522f664ad5edf7c282a211b5b65958c73

2017-05-16 22:03:11 +00:00

..

java

Merge "SurfaceView: Reset window stopped state when attaching to window." into oc-dev

2017-05-16 22:03:11 +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 "Import translations. DO NOT MERGE" into oc-dev

2017-05-16 18:42:26 +00:00

tests

Merge "ignore IllegalArgumentException during uninstall" into oc-dev

2017-05-16 18:37:27 +00:00