tree 03d491a3b5417cdc68e769fcf28249cad2cf7563
parent aa5c7565e42efdfa5ae5506a0a9dfd4f05461034
parent 0f11e15f503d65d5a085157d8ec406a72d712ce7
author Paul Lawrence <paullawrence@google.com> 1409003966 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409003967 +0000

Merge "Honor hide pattern on crypto screen" into lmp-dev