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)
commit61082f5d58fd25fc72196f3bd882e3cdaf00488c
treeda1fa0d8d6913291c3dcace3b5a997b44d464026
parenta17567bd4b2ea8e01d49bf248b75a43b07396706
parent80615008479fb60a1f5c55d2f68a690f8caaa941
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev am: fd8b8eb0b1
am: 8061500847

Change-Id: I76248c968334e04f9b878f184f60596cf5750a68