diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-21 13:19:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-21 13:19:04 -0700 |
| commit | 74573701ee9863a0d2f1ba638b1c1cce69cdc2b2 (patch) | |
| tree | 533234845fec7e313d2285786a451955a3906d0d /vm/compiler/codegen/arm/CodegenCommon.cpp | |
| parent | 067c62027dc592224e1ae16f9847b7273d3e4026 (diff) | |
| parent | 9bd5a9db106863069dd6c12de881acca6103f8d7 (diff) | |
am 9bd5a9db: Reconcile jb-dev and AOSP
* commit '9bd5a9db106863069dd6c12de881acca6103f8d7':
Fix an ugly bug where try/catch offsets weren't being mapped properly. do not merge.
Fix a bug where the max blowup of annotations was incorrect. do not merge.
Fix a bug where debugInfos' size wasn't being computed. do not merge.
Make dex merging stateless. do not merge.
Support debug info in dexmerge. do not merge.
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenCommon.cpp')
0 files changed, 0 insertions, 0 deletions