From: Maurice Lam <yukl@google.com>
Date: Wed, 26 Nov 2014 18:42:34 +0000 (+0000)
Subject: am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard... 
X-Git-Tag: android-x86-6.0-r1~671^2~182
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=edfc6a0a5fb4d371272e4b4c80de22c4ff346214;p=android-x86%2Fpackages-apps-Settings.git

am 628e89e9: am 3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev

* commit '628e89e94580cd0734fe9aa85065e58021e8e9d8':
  [Setup] Theme ChooseLockGeneric for setup wizard
---

edfc6a0a5fb4d371272e4b4c80de22c4ff346214