Jorim Jaggi 7fd12db350 Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev automerge: 3c7efdc
automerge: 61059fe

* commit '61059fe82ca43adcd34ab8f48201a8925dcec164':
  Only hide sensitive content when Keyguard is showing
2014-11-04 00:05:04 +00:00
..