OSDN Git Service

DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours...
authorChenjie Luo <cjluo@google.com>
Mon, 18 Jul 2016 23:45:23 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jul 2016 23:45:23 +0000 (23:45 +0000)
am: daddf59fe6  -s ours

Change-Id: I9a49c02e5f6992425e7b41a3f4381a31c5f1f910


Trivial merge