| commit | cacf91e466584f1ff3b59b95f9a7e18d822243e5 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Jul 13 22:51:40 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 13 22:51:41 2016 +0000 |
| tree | 687d3c664dc6c016bb994d60152b3126bb01a871 | |
| parent | 0357ea40768fb6c2f3f20a1345ac0b2fedb58049 [diff] | |
| parent | a5a732e8afe61a167639a961170345c9cb74fc92 [diff] |
Merge "Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev am: 55c7c9c2d4" into nyc-mr1-dev-plus-aosp