| commit | ea3602d912e6b41fdf8c54481da8994f6a43a2d5 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jul 31 12:44:38 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 31 12:44:38 2017 +0000 |
| tree | ffed28c649bc53ff079eb6baf34bf849b03a8bbf | |
| parent | 1ad42266872e44af553c32a950fb002748d1d452 [diff] | |
| parent | 5b69ea4b1a452205d03163e99ab3b05e84d226ad [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