tree 2cd045b94d4fe7bf8e707457cc63523ea8d80ab6
parent 5ecc4601ea2672e1e52bcd0860908d1cae7db4c2
parent ac8a1b21986f06d0e54ddebb1e4962de23eb77ea
author Brian Carlstrom <bdc@google.com> 1308849998 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308849998 -0700

Merge "Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)"