| commit | fec153a765edf051f3b97610c748d1ab9526cbfa | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@android.com> | Thu Aug 25 14:30:08 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 25 14:30:08 2011 -0700 |
| tree | 3eb37eb35a50c0efd074b9d1cb7ed3c90bb6b2eb | |
| parent | c0a719b864071df069859ef595271020b960a99a [diff] | |
| parent | 9765cb8a7f29dacc615d2357d04ee5412c3e888d [diff] |
am 9765cb8a: am 2a59fa7d: Merge "emulator: fix the build" * commit '9765cb8a7f29dacc615d2357d04ee5412c3e888d': emulator: fix the build