Jorim Jaggi 768ce6edf6 Merge "Fix window affecting SysUi visibility for once and all" into oc-dev ...

am: 6cfc8afa7a

Change-Id: I0bf707ab3ad162b1c7b868719d3347f489f51964

2017-05-23 17:11:57 +00:00

..

java

Merge "Fix window affecting SysUi visibility for once and all" into oc-dev

2017-05-23 17:11:57 +00:00

jni

Merge "Convert Shader to NativeAllocationRegistry" into oc-dev

2017-05-23 16:51:19 +00:00

proto/android

strong fp lockout after 20 failed attempts

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

res

Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev

2017-05-23 03:38:03 +00:00

tests

Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev

2017-05-22 22:17:58 +00:00