tree fe0580d3e8495f800e87c2915dd68e1d6755a68f
parent c7ccba68592cfa1afad36abe56e4e8caba37014a
parent e52c159cd9b34222ca0440e824d729a9428cbfe6
author Amith Yamasani <yamasani@google.com> 1413579754 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413579754 +0000

am e52c159c: Fix some strings for the encryption stuff.

* commit 'e52c159cd9b34222ca0440e824d729a9428cbfe6':
  Fix some strings for the encryption stuff.