| commit | 43946da54d3dc8d840c5e39c8eaf2f46ece57518 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@android.com> | Thu Aug 25 13:48:05 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 25 13:48:05 2011 -0700 |
| tree | 04ff0959a872bf6f1995bac667c85fad106dd5e8 | |
| parent | 9765cb8a7f29dacc615d2357d04ee5412c3e888d [diff] | |
| parent | 7f45e7c1822fd583dd0c9776cb2c1e8d4aa6cb54 [diff] |
am 7f45e7c1: Merge "emulator: oops, really fix the build" * commit '7f45e7c1822fd583dd0c9776cb2c1e8d4aa6cb54': emulator: oops, really fix the build