| commit | 9a254ac907120a3157bcf0e61a8ad716df1181f2 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Wed Apr 09 23:57:34 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 09 23:57:35 2014 +0000 |
| tree | c04443664e1f4f11916c4565e5081afb189a161b | |
| parent | 6ca5f8cd78a8970043821c9531c433eb841c57f3 [diff] | |
| parent | 3bc62f724be10d82698a0fbbfa9fd72783f87ef5 [diff] |
Merge "Allow returning from quick settings on lockscreen" into master-lockscreen-dev