| commit | 1ebbe3af39076c51669d5d1a68e057bb6806c307 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Mon Jul 31 12:50:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 31 12:50:30 2017 +0000 |
| tree | b7074eaf276bec67302493616015302750e8a776 | |
| parent | d5cd03d7306dcc3381397cac5c6ea4047a122341 [diff] | |
| parent | ea3602d912e6b41fdf8c54481da8994f6a43a2d5 [diff] |
Merge "Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148 am: 86e49f224c" into oc-mr1-dev-plus-aosp am: ea3602d912 Change-Id: I6c438d0ac3b6ad435f8ab6328cc9b2ae4e13bf22