OSDN Git Service

am b72f97c0: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog...
authorJim Miller <jaggies@google.com>
Mon, 27 Oct 2014 18:53:16 +0000 (18:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 18:53:16 +0000 (18:53 +0000)
* commit 'b72f97c0f18c08972997ddce481b8939566a135c':


Trivial merge