OSDN Git Service

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

Change-Id: I2f22b732d4268af4ce2fd537746287bda8091e70