From: The Android Open Source Project Date: Tue, 21 Aug 2012 23:07:03 +0000 (-0700) Subject: Reconcile with jb-mr1-release - do not merge X-Git-Tag: android-x86-4.4-r1~634^2~423 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e696e534;p=android-x86%2Fpackages-apps-Settings.git Reconcile with jb-mr1-release - do not merge Change-Id: Id59555adc024005fc53103e2006e987e72283811 --- e696e53483068dd6bd0aa0ccde42bc1a1b75d336