tree a133d9e17662c8265893f3b8d7c018202611136c
parent 273bb516ad875048bb14eb4f3f598c295c44991a
parent a6c03f8d27cf6239e318e815dd12e2eed5d300a4
author Adrian Roos <roosa@google.com> 1501504184 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501504184 +0000

Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev