From: The Android Open Source Project Date: Tue, 28 May 2013 14:37:45 +0000 (-0700) Subject: Reconcile with jb-mr2-release - do not merge X-Git-Tag: android-x86-4.4-r1~95^2~86 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=52f3b7c3;p=android-x86%2Fpackages-apps-Settings.git Reconcile with jb-mr2-release - do not merge Change-Id: If34271bddb2819de365f53ba61b744b6598bda57 --- 52f3b7c3919a0ca35b4679b5227468efb1b4d459