tree 5c78107c58350a3c0bcf9f9aec6d59fd27dde2ad
parent ff43d8f3b73d1345521a907485d52690815e0bae
parent 22430d5abb24666afedd684ab46f31ddcd428a3c
author Christine Franks <christyfranks@google.com> 1485976481 +0000
committer android-build-merger <android-build-merger@google.com> 1485976481 +0000

DO NOT MERGE - Require password to FR in carrier demo mode
am: 22430d5abb

Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774