| commit | 3ea0a81c2bf2ad806a21c1df390751a4b68ebee1 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Aug 22 15:27:37 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 15:27:37 2012 -0700 |
| tree | c855c5d85cd6a6b943b369af6781a123c51b0ab3 | |
| parent | d1a9deeb9af69a2af638dc337d2fad03c1a37e7e [diff] | |
| parent | d19511a6657efc7f1a7e544df04f076223f8fe65 [diff] |
am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev * commit 'd19511a6657efc7f1a7e544df04f076223f8fe65': Support EMMA_INSTRUMENT in both full and unbundled builds.