am 82c852cb: (-s ours) am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '82c852cb4644e28b55fad08f04cae9e124b32cc2':
  Fix an NPE in recorrection
  Fix an NPE in recapitalize
main
The Android Open Source Project 2013-05-16 05:51:40 -07:00 committed by Android Git Automerger
commit 265861dc98

Diff Content Not Available