| commit | 07e4af14dfcbc22e177a122e85278429bc25637b | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Wed Apr 28 12:48:45 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 28 12:48:45 2010 -0700 |
| tree | 7b10b7b40f5a8c6b7cc34519a3b7dfbd1d414027 | |
| parent | fe0dabac54c0bada280a15fb9b499a084b837e86 [diff] | |
| parent | f69aac3c1697d31dbeda8a81d2b32bb8f48b6850 [diff] |
am cfb71ee5: (-s ours) no emma instrumentation on core-test Merge commit 'cfb71ee5d72b7514d05b782c780d20cc5e6f73cb' into dalvik-dev * commit 'cfb71ee5d72b7514d05b782c780d20cc5e6f73cb': no emma instrumentation on core-test