OSDN Git Service

Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev am: fd8b8eb0b1
authorChristine Franks <christyfranks@google.com>
Sat, 22 Jul 2017 00:32:30 +0000 (00:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 00:32:30 +0000 (00:32 +0000)
am: 8061500847

Change-Id: I76248c968334e04f9b878f184f60596cf5750a68


Trivial merge