tree 47d82b73aa34e8d6833de41c3f60d4433aee362e
parent 82792153c31869535723bb7e3619821e937c8f86
parent 48a92a5dbbf98d9f0235554e2bea3c969f7f2cee
author TreeHugger Robot <treehugger-gerrit@google.com> 1494305660 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494305664 +0000

Merge "Handling the touch better when the screen turns off" into oc-dev