| commit | 8b430e370afd089d245455b61f8450fc5a123461 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Tue May 18 18:37:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 18 18:37:42 2010 -0700 |
| tree | 4c463bb50e3ab5fd3f3fcc2fd8f3a88cfb4f7025 | |
| parent | 14d6c9f1b609e54164e8aa4c545a0a136c6662b5 [diff] | |
| parent | 8923143818dd5de89c284f954df906f4bf75972c [diff] |
am b990f4f4: (-s ours) am 984680ba: Merge "disable emma instrumentation for framework, ext and services (DO NOT MERGE)" into kraken