commit | 6622af5d104652566695ec40ec33cf12758ff940 | [log] [tgz] |
---|---|---|
author | Fyodor Kupolov <fkupolov@google.com> | Tue Jun 28 23:14:39 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 28 23:14:39 2016 +0000 |
tree | 95b5037dead9dcc176cae6bb4d8d655c3da1bc33 | |
parent | 0f388665281feb4f029421d5358640494007188d [diff] | |
parent | cc1379bfea1dea1c90d5b0d8659dd3fe5b41adcc [diff] |
Merge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev am: cc1379bfea Change-Id: I49c818af2a1f966c60f7ba184cf50fcfcae788ad