| commit | 57dc5a5263f818acf606bd9d076b779fd247777a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Mar 16 16:22:44 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 16 16:22:44 2012 -0700 |
| tree | 90ff8afe209e1ca535b61b2d5e6548a79bd5adb6 | |
| parent | 22c544e31371065b51a516893e367eb8f2dc0107 [diff] | |
| parent | 594e76f8d5fc7c8e419ead1185cfe91dd9036d0c [diff] |
am 594e76f8: Merge "Fix the Mac build, and clean up some test-only code." into ics-mr1-plus-art * commit '594e76f8d5fc7c8e419ead1185cfe91dd9036d0c': Fix the Mac build, and clean up some test-only code.