OSDN Git Service

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

Change-Id: I0a3e1f1d9dcca852e1db83a92e2b5884dea02901


Trivial merge