From: The Android Open Source Project Date: Wed, 28 Nov 2012 17:49:35 +0000 (-0800) Subject: am ee76e181: (-s ours) Reconcile with jb-mr1.1-release - do not merge X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=553e157a0f481b70c990e216b1c7b6a0a2b98610;p=android-x86%2Fpackages-apps-Trebuchet.git am ee76e181: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'ee76e18125438183d7e7bfa5e2b10172fcf565ec': --- 553e157a0f481b70c990e216b1c7b6a0a2b98610