Wale Ogunwale 0f8ce259fb Merge "Changed alert window notifications to use single channel" into oc-dev am: 648e127fcb ...

am: 33c831a15c

Change-Id: Ib94d4d4e12cf6cfb7fc9e6c2a63b4d47b40223ca

2017-05-15 22:43:42 +00:00

..

java

Merge "Changed alert window notifications to use single channel" into oc-dev am: 648e127fcb

2017-05-15 22:43:42 +00:00

jni

Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev

2017-05-13 01:52:23 +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 "Changed alert window notifications to use single channel" into oc-dev am: 648e127fcb

2017-05-15 22:43:42 +00:00

tests

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

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