commit | 7fd12db350a341eb7a50759aa329be5281556928 | [log] [tgz] |
---|---|---|
author | Jorim Jaggi <jjaggi@google.com> | Tue Nov 04 00:05:04 2014 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 04 00:05:04 2014 +0000 |
tree | be7f28aff00a72219a59e0df941fab96ee4f6270 | |
parent | 9a4dc72b3539827eee12594d4d149612e0182409 [diff] | |
parent | 61059fe82ca43adcd34ab8f48201a8925dcec164 [diff] |
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