commit | 265861dc98879410075b14ac2e86ff02c60f214e | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:51:40 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:51:40 2013 -0700 |
tree | fa225299ab3812b8a27babc4bfe736b78045fc19 | |
parent | f83050d961c959b4eb8a8d57473803e7b024a2b6 [diff] | |
parent | 82c852cb4644e28b55fad08f04cae9e124b32cc2 [diff] |
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