| commit | 835a04c8527c90b0c00a2c52f67488946912c82e | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Apr 06 18:19:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 18:19:35 2015 +0000 |
| tree | 7d8d8cac0f8b7ebc55c20f7d7bbdd5ea53a47392 | |
| parent | 8bd4bee8397bd077ae94561fa491350f569ec6b3 [diff] | |
| parent | 5b16ceaf886e9c6d75f1122e3b53213652199c37 [diff] |
am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." * commit '5b16ceaf886e9c6d75f1122e3b53213652199c37': Allow inputflinger to have CAP_BLOCK_SUSPEND.