tree fa7172b5c70e6b65c8eaca69b58186288507c49b
parent 63aa80f6edadac1eaf245333f4762832d4cd0937
parent c5c2e53779c2c2b6d889bdad5d11d47da9e72789
author Jorim Jaggi <jjaggi@google.com> 1417027427 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417027427 +0000

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