merge in jb-mr2-release history after reset to master
The Android Automerger [Wed, 13 Feb 2013 13:56:34 +0000 (05:56 -0800)]

Trivial merge