tree b8b8aa3acc9b8b94b80155c2b93d79343299cee3
parent 1f3f304066deff9b3b9dd6181db4b1f3234757c2
parent c612a97ab921072a38589686aa92a36a6eae6595
author Jeff Sharkey <jsharkey@android.com> 1383690251 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383690251 -0800

am c612a97a: am fa6c8019: am f02f5199: Always show cert dialog after unlocked.

* commit 'c612a97ab921072a38589686aa92a36a6eae6595':
  Always show cert dialog after unlocked.