| commit | 3221a342117bc3fd366e3f6520db0cb0672bb1f1 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Oct 17 23:57:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 17 23:57:34 2014 +0000 |
| tree | d180b73b771b01f480bcf5ccead096c85c57a2eb | |
| parent | 1f39d6a6e78d5fd0595306d1ed38a8f7ac04e3fe [diff] | |
| parent | ba1b33407d66289a2367caab3141a3555f1fdcf7 [diff] |
am ba1b3340: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev * commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7': Several fixes to new EncryptionInterstitial dialog.