| commit | fa930655004ca212e4f4655dd0defd3306356dd2 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Thu Jun 28 15:59:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 28 15:59:30 2012 -0700 |
| tree | c698f136dd9b859d3e7f89c29d3ed64a2630a37b | |
| parent | 78fe99c83550df125537c7600794109dc32f2ea2 [diff] | |
| parent | 4c1dadc743248d9c8a12a94d628e74cd3d5d79f8 [diff] |
am 4c1dadc7: Merge "Fix exception gtest for when we have VERIFY_OBJECT_ENABLED = 1." into ics-mr1-plus-art * commit '4c1dadc743248d9c8a12a94d628e74cd3d5d79f8': Fix exception gtest for when we have VERIFY_OBJECT_ENABLED = 1.