tree ecf3a9e717071d723e37f00b852190834a43c325
parent 8482cf3c324c64d3d3c81b4f91043a3e280b983a
parent 7fd82cc3469cfebb7b2b8ab9ad09f17459e1cffa
author Svetoslav Ganov <svetoslavganov@google.com> 1314407884 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314407884 -0700

Merge "Lock screen should be kept on while it is touch explored."