Kevin Chyn ff8cfea871 Merge "Do not dismiss BiometricPrompt when "soft" errors are received" into qt-dev ...

am: d9919f2750

Change-Id: I9264ad365a7f7165941688e95181e873d82090d4

2019-04-24 21:57:37 -07:00

..

java

Merge "Do not dismiss BiometricPrompt when "soft" errors are received" into qt-dev

2019-04-24 21:57:37 -07:00

jni

Merge "Add support for /oem/overlay" into qt-dev

2019-04-24 05:32:03 -07:00

proto

Merge "Finish up Intent identifier implementation." into qt-dev

2019-04-23 22:43:34 +00:00

res

Merge "Sharesheet - add label loading placeholder" into qt-dev

2019-04-24 19:48:56 -07:00

tests

Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev

2019-04-23 15:57:23 -07:00

xsd

…