tree 4d57343e43b9a725aa1f2ae6a975819f317fe9d6
parent c4fb3e3e76f289f47efcc7fb84737a70b9cbdcee
parent 040538693456b1975ab6184698e420a4d1c78e6e
author Christine Franks <christyfranks@google.com> 1484977678 +0000
committer android-build-merger <android-build-merger@google.com> 1484977678 +0000

Merge "DO NOT MERGE - Require password to FR in carrier demo mode" into nyc-mr2-dev am: e1a7e67dc0
am: 0405386934  -s ours

Change-Id: I1fd1fd38e3a2d7b7491cf279d36183ba67839753