From: Paul Lawrence <paullawrence@google.com>
Date: Tue, 19 Aug 2014 20:59:12 +0000 (+0000)
Subject: am d5a497b8: Merge "Change decryption strings" into lmp-dev
X-Git-Tag: android-x86-6.0-r1~671^2~776^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=71894714c920cc08aa15c1423d3f370cbcc2f409;p=android-x86%2Fpackages-apps-Settings.git

am d5a497b8: Merge "Change decryption strings" into lmp-dev

* commit 'd5a497b8375444858fb17008a450d3bc26269d1c':
  Change decryption strings
---

71894714c920cc08aa15c1423d3f370cbcc2f409