| commit | 69e299d9a9c29bfe7d8ff9a9231df7bdc3baa1c3 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Apr 19 15:23:34 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 19 15:23:36 2016 +0000 |
| tree | f25f1d23aae336c947c66fade03e8d058000bb16 | |
| parent | 808cbae4651e3ae82a2b28169a3716f09f0aadeb [diff] | |
| parent | dfbdb6f61cd026642f81c858386907b792b087bd [diff] |
Merge "Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev am: 95a127c am: b4c3c1f" into nyc-mr1-dev-plus-aosp