From: Paul Lawrence Date: Mon, 15 Sep 2014 23:54:56 +0000 (+0000) Subject: am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption... X-Git-Tag: android-x86-6.0-r1~671^2~608 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f88a60f0;p=android-x86%2Fpackages-apps-Settings.git am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev * commit '8826a64a6cd4a44b55033557e5b4867bcf131e35': --- f88a60f09e1eaa989408c6b09f0b24ed876b9fb3