tree 5a2234f22a04eacce8a28a38b896a396db8a12c3
parent c48e304bbffd10e6bb0e94cb3c8b83d612d79b04
parent b7c929977c60f0a33fc5bd8339ca7c1770f0980f
author Christine Franks <christyfranks@google.com> 1500663196 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500663196 +0000

Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev