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