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:31:48 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 00:31:48 +0000 (00:31 +0000)
commitc2bd97a5df96adffc5f4bbd491ef58c67d11298c
tree50754ddb37dc9677b064dd4eaa741d615a0ca77a
parent80615008479fb60a1f5c55d2f68a690f8caaa941
parentc35038647602c5dd93646c6178c0b0aa820f6130
Merge "Move logic for FR in demo mode out of Settings" into oc-dr1-dev am: cb9a7075f8
am: c350386476  -s ours

Change-Id: I6371e6575ba1b60dfe1c715c46e17be4f6340d98