OSDN Git Service

Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev
authorFyodor Kupolov <fkupolov@google.com>
Tue, 28 Jun 2016 23:08:46 +0000 (23:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Jun 2016 23:08:46 +0000 (23:08 +0000)

Trivial merge