tree 57b8ad528e8b6e2f66aaaf5901053b691015b6b7
parent fec94660fb1b3ea76b49c52e1a6d0741e19bec2a
parent 602d559d9c59074664ad684579dc3d14a09219cb
author Jim Miller <jaggies@google.com> 1413589965 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413589965 +0000

am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev

* commit '602d559d9c59074664ad684579dc3d14a09219cb':
  Several fixes to new EncryptionInterstitial dialog.