OSDN Git Service

Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev
authorChristine Franks <christyfranks@google.com>
Fri, 21 Jul 2017 23:59:23 +0000 (23:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Jul 2017 23:59:23 +0000 (23:59 +0000)
commitfd8b8eb0b1f45bfa543f62a88a04122157ebdd63
tree18f4a4a4a6572933358eae186d82efdd974ff084
parentf364c303309777a5769e1e1a519538437e6e7492
parentc6890ab6c51185ff39d9cbdf48b04d14518b9a27
Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev