commit | 82c852cb4644e28b55fad08f04cae9e124b32cc2 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu May 16 05:48:21 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 16 05:48:21 2013 -0700 |
tree | fa225299ab3812b8a27babc4bfe736b78045fc19 | |
parent | 17b63ba588598d0bd6f643d3a8cb385c75d2c163 [diff] | |
parent | b528e2511377b58f2c7e0d1046b3645a3716e0ab [diff] |
am b528e251: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'b528e2511377b58f2c7e0d1046b3645a3716e0ab': Fix an NPE in recorrection Fix an NPE in recapitalize