tree dd7ff28e22ea6882ddb53c493c35a8e88bef82fd
parent 50e229f1f45a1550ba13ec3f81e864630fc3dc1c
parent f1cdf9558d2b7f8fe5b8cf3d309b48809f04403b
author Jorim Jaggi <jjaggi@google.com> 1459979813 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459979815 +0000

Merge "Don't lock device when double tapping" into nyc-dev