Ajay Nadathur b9c3eb954a Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev ...

am: 0ed0319005

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7

2017-08-09 20:27:45 +00:00

..

app

Merge "Misc fixes for settings" into oc-mr1-dev

2017-08-09 18:03:29 +00:00

robotests

Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev

2017-08-09 20:15:20 +00:00

unit

Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev

2017-07-26 16:18:50 +00:00

Android.mk

…