From: The Android Open Source Project Date: Tue, 27 Nov 2012 15:46:34 +0000 (-0800) Subject: am 346f5a48: (-s ours) Reconcile with jb-mr1.1-release - do not merge X-Git-Tag: android-x86-4.4-r1~778 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7476f782df28383b45b9942c2e59d32cc67c648e;p=android-x86%2Fpackages-apps-Settings.git am 346f5a48: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '346f5a481b945251245429be649c005a0d9103ad': --- 7476f782df28383b45b9942c2e59d32cc67c648e