commit | d512a39a7394c35e9e67ac938c8f774a75f2b9c6 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Tue May 01 22:22:23 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 01 22:22:23 2012 -0700 |
tree | 81ced867f22ebf547a61729aec666933deb74ab6 | |
parent | 23148bebc7fc90d266b8a4747027aa66797a1599 [diff] | |
parent | 1d5abec2454f3144f2c816674760aaac6e28bd0f [diff] |
am 1d5abec2: Merge "Fix Mac build." into ics-mr1-plus-art * commit '1d5abec2454f3144f2c816674760aaac6e28bd0f': Fix Mac build.