| commit | e2298972ec262a7231dab7ad560f0779ac38c79f | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jul 18 23:48:19 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 18 23:48:19 2016 +0000 |
| tree | 2bedcd81de7cbf4dcb16c4638105f9d603e374eb | |
| parent | c0f882e78b7e0b2f1ad73a3cbd73b94eb8fb1a69 [diff] | |
| parent | 3a1add4f34a867664050b600b5d5c12f06437fba [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: 29716dcc6b -s ours" into nyc-mr1-dev-plus-aosp