From: The Android Automerger <android-build@android.com>
Date: Mon, 15 Oct 2012 13:59:38 +0000 (-0700)
Subject: merge in jb-mr1-release history after reset to jb-mr1-dev
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0c762a978ecd4c6145484bc68627cb8fd9c60209;p=android-x86%2Fpackages-apps-Trebuchet.git

merge in jb-mr1-release history after reset to jb-mr1-dev
---

0c762a978ecd4c6145484bc68627cb8fd9c60209