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:42:31 +0000 (00:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 00:42:31 +0000 (00:42 +0000)
commit3c7c33003895e116b9f9b43691655281ce5c89a9
treed87bfba0e1e1fc31d8c1f4906ec5e4eb21810406
parent8047d73aeadb816034ab7ba41f54d660e306fe39
parente147a1977342cd24e7efc796076ce9f787ad9a97
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8  -s ours am: 18cd618368
am: e147a19773

Change-Id: I14470dfb8a49a412a7ec3b06136b2c4cb97d2345