merge in jb-mr2-release history after reset to master
The Android Automerger [Mon, 11 Feb 2013 15:12:24 +0000 (07:12 -0800)]

Trivial merge