OSDN Git Service

DO NOT MERGE - Require password to FR in carrier demo mode
authorChristine Franks <christyfranks@google.com>
Wed, 1 Feb 2017 19:14:41 +0000 (19:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 1 Feb 2017 19:14:41 +0000 (19:14 +0000)
am: 22430d5abb

Change-Id: Ib3d154cb753b07278355ec1c34dca5916f619774


Trivial merge