From: The Android Open Source Project Date: Thu, 6 Sep 2012 15:21:38 +0000 (-0700) Subject: am c53ce268: (-s ours) Reconcile with jb-release - do not merge X-Git-Tag: android-x86-4.4-r1~634^2~3^2~232 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=710aeba1ce0bf2d121aaaf659284074750b43c6e;p=android-x86%2Fpackages-apps-Settings.git am c53ce268: (-s ours) Reconcile with jb-release - do not merge * commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214': --- 710aeba1ce0bf2d121aaaf659284074750b43c6e