| commit | 86e49f224c9e80ba4c89ac5e9705ff3e015579ca | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Jul 31 12:36:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 31 12:36:21 2017 +0000 |
| tree | ce7c0a76f549862fdd3b37b0b8a62a79d4090baa | |
| parent | b10ffae3cb77efffd03f614f1622a68d1134c9b1 [diff] | |
| parent | 3cace2a1482784ace8b8f732bfbb646b9ef612df [diff] |
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148 Change-Id: Ia30c3884751a44392efb843a2da41a0528162fa2