From: Amith Yamasani <yamasani@google.com>
Date: Thu, 11 Oct 2012 05:28:19 +0000 (-0700)
Subject: am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
X-Git-Tag: android-x86-4.4-r1~634^2~14^2~168
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01f7688555377feeced5da19129ea5c04505d279;p=android-x86%2Fpackages-apps-Settings.git

am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev

* commit '4465bbb7e14020e10620cda70fc51896b57ced67':
  Fix crash in Settings for secondary users
---

01f7688555377feeced5da19129ea5c04505d279