tree cb4c17b9a3ef5d42c4c770650938c2794e6126a8
parent 05ac723b8e7488e63b405da806e1d7ab0c8559e6
parent 0d472daee45249d3954454fc9691724215752013
author Yorke Lee <yorkelee@google.com> 1411603580 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411603580 +0000

am c74a2f38: am 7b601bc0: am 5e001805: am 04746eec: Reallow quick text response on lockscreen

* commit 'c74a2f3841fdcbbe15a3884e9c1f07c595c49041':
  Reallow quick text response on lockscreen