| commit | 7f12104437c83dbe8cc2f109109dee909a892ed3 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Mon Apr 06 18:40:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 18:40:28 2015 +0000 |
| tree | 3c77d51f2f2fc923e73340ffcaa9575140c5c1d5 | |
| parent | b9d0ed4af69b9f8002eb8330c7f91be07c755214 [diff] | |
| parent | d6110d2f44e6e08d1c61227399a5788c905bb9d5 [diff] |
am 835a04c8: am 5b16ceaf: am 08fe38e2: Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND." * commit '835a04c8527c90b0c00a2c52f67488946912c82e': Allow inputflinger to have CAP_BLOCK_SUSPEND.