merge in jb-mr2-release history after reset to master
The Android Automerger [Tue, 19 Feb 2013 17:52:06 +0000 (09:52 -0800)]

Trivial merge