| commit | 73ae2d3adca786efed712e088b03c520fe7e9790 | [log] [tgz] |
|---|---|---|
| author | Lucky Zhang <luckyzh@google.com> | Mon Dec 08 09:31:45 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 08 09:31:46 2014 +0000 |
| tree | 7e7e123722d9777ac7bf664c91cacda74635900b | |
| parent | 400e93785016cce831b14990365ab7636b846648 [diff] | |
| parent | df8566a9a1eb69ee19376457fe0ee8ad39774790 [diff] |
Merge "[FRP] Remove None and Swipe from screen lock options" into lmp-mr1-dev