OSDN Git Service

Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev...
authorAdrian Roos <roosa@google.com>
Thu, 3 Aug 2017 15:28:25 +0000 (15:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 15:28:25 +0000 (15:28 +0000)
commitec40b1b0b6951c5e84cfbe06c716d9b66433edc3
treeb637529f3720bfed6515197891676c1cdd4bd93c
parentdcd37245f6056942f7769da4fd6379db5d718430
parent37bcab378bddcd46602713040eeb1e1d0d3f8ef3
Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am: a957c56da0 am: 49cbe41a2b" into oc-mr1-dev-plus-aosp
am: 37bcab378b

Change-Id: I83f1cc70904e65ba71931fe614ecb14d74a10e4f