OSDN Git Service

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

Change-Id: Id75c03768308873b6b2666eaae6d1c86f23d1663