From: Paul Lawrence <paullawrence@google.com>
Date: Tue, 19 Aug 2014 20:50:14 +0000 (+0000)
Subject: Merge "Fix encryption strings" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~860^2~533
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b7b686ca;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix encryption strings" into lmp-dev
---

b7b686cadf6a07c74672d4e1c3aab30e7d24a545