| commit | 654e17f11cb95e032d16056425262fd545c417ff | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jul 18 23:48:21 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 18 23:48:21 2016 +0000 |
| tree | 2bedcd81de7cbf4dcb16c4638105f9d603e374eb | |
| parent | e2298972ec262a7231dab7ad560f0779ac38c79f [diff] | |
| parent | 7c8244f012a58aaa2271c0c38a21b6c8eb165b64 [diff] |
Merge "DO NOT MERGE ANYWHERE power: Adds POWER_HINT_DISABLE_TOUCH am: 2df182d7b1 -s ours am: 3e8005b289 -s ours am: daddf59fe6 -s ours am: 8ae3d7582a -s ours" into nyc-mr1-dev-plus-aosp