Jorim Jaggi 7d754e0ccb am f1e6d231: am c5c2e537: Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev
* commit 'f1e6d2315eea6e9f289b8c1bafc04a4cbc6f05e1':
  Make IKeyguardService interface asynchronous
2014-11-26 19:42:19 +00:00
..
2014-11-24 06:20:00 -08:00