diff options
author | Daniel Sandler <dsandler@android.com> | 2012-11-08 09:28:13 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-08 09:28:14 -0800 |
commit | 4eada64770bc2f021cb04cbb77efbad1c9a7adc4 (patch) | |
tree | 2855cb60c3b5b9892012398a2e57f09ad7ca6038 /docs/html/sdk/api_diff/4 | |
parent | 14adfe425e67c9ec12b0841a62c5c03ce00838ea (diff) | |
parent | 6ed3fcafdbdeda9a10a62bbd0e5997017e8e2635 (diff) |
Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev
Diffstat (limited to 'docs/html/sdk/api_diff/4')
0 files changed, 0 insertions, 0 deletions