commit | 18f0405e755b75e5f0532e0d5399629da708b587 | [log] [tgz] |
---|---|---|
author | Eric Laurent <elaurent@google.com> | Tue May 25 12:44:08 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 25 12:44:08 2010 -0700 |
tree | 9d11e5f9ee406798070a5cb335390147ae1dffa5 | |
parent | ded634d7a25c0d06424c2153414a8244aaf2c1d9 [diff] | |
parent | dee5c2a3dc3a34ad9f285d7e769dca9dead614c9 [diff] |
am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken