| commit | ed47b41164d8cdff736b7c4bbcdf2c6696ad1c30 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Apr 04 12:01:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 04 12:01:52 2012 -0700 |
| tree | a67ae2c83f628b981493957c368fdd54e833deb8 | |
| parent | c8d666176858f52a6e103f1a35c3235f14e9f079 [diff] | |
| parent | 899214c7b94b2f21d2fee2b77e2482ea6b18c0d1 [diff] |
am 899214c7: Merge "Fix Mac OS build breakage." into ics-mr1-plus-art * commit '899214c7b94b2f21d2fee2b77e2482ea6b18c0d1': Fix Mac OS build breakage.