From: The Android Open Source Project Date: Wed, 28 Nov 2012 17:47:48 +0000 (-0800) Subject: Reconcile with jb-mr1.1-release - do not merge X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ee76e18125438183d7e7bfa5e2b10172fcf565ec;p=android-x86%2Fpackages-apps-Trebuchet.git Reconcile with jb-mr1.1-release - do not merge Change-Id: Ib1209178390b84af2e57494299fa9320050154e3 --- ee76e18125438183d7e7bfa5e2b10172fcf565ec