Commits
Jorim Jaggi authored and Android Git Automerger committed f1e6d2315eeM
am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev * commit 'c5c2e53779c2c2b6d889bdad5d11d47da9e72789': Make IKeyguardService interface asynchronous
Showing diff toc5c2e53779c