merge in jb-mr2-release history after reset to jb-mr2-dev
authorThe Android Automerger <android-build@android.com>
Tue, 30 Apr 2013 12:56:09 +0000 (05:56 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 30 Apr 2013 12:56:09 +0000 (05:56 -0700)

Trivial merge