diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-11-03 23:27:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-03 23:27:18 +0000 |
| commit | 61059fe82ca43adcd34ab8f48201a8925dcec164 (patch) | |
| tree | 5f9ad1a124ee6397d84e327c54f271cad7f4f10e /tools/aapt | |
| parent | 343baef7a50c5cdafeeab6b22cd8a888d5cef29c (diff) | |
| parent | 3c7efdc00506e6561ca08933f0b2acf5e3f16b02 (diff) | |
| download | frameworks_base-61059fe82ca43adcd34ab8f48201a8925dcec164.zip frameworks_base-61059fe82ca43adcd34ab8f48201a8925dcec164.tar.gz frameworks_base-61059fe82ca43adcd34ab8f48201a8925dcec164.tar.bz2 | |
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev
automerge: 3c7efdc
* commit '3c7efdc00506e6561ca08933f0b2acf5e3f16b02':
Only hide sensitive content when Keyguard is showing
Diffstat (limited to 'tools/aapt')
0 files changed, 0 insertions, 0 deletions