OSDN Git Service

Merge "AOD: When prox covered disable touch during pulse instead of aborting" into...
authorAdrian Roos <roosa@google.com>
Mon, 31 Jul 2017 12:42:13 +0000 (12:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 31 Jul 2017 12:42:13 +0000 (12:42 +0000)
am: 13b17b2990

Change-Id: Ib7e303b11b47096daf7216cd6dbd109a047733f9


Trivial merge