tree 4dfdb8f7f9fc195756562329ba608e6adcaaf055
parent 6be08229aed4101b309c4da31303554ebfa0326c
parent 71f507bbe9a6700f80389423507212973a2fc43f
author Dan Sandler <dsandler@android.com> 1401998676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401998676 +0000

am 4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev

* commit '4ccaa092d49deb84885b5daf2e6d6f1c745d56bf':
  Don't show private notifications if a secure lockscreen is merely occluded.