commit | e205dd34a52a05b5037dfb8979190b234d5557dd | [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 | e735d36713cadabd068fd9161d5ed6f0767bb6d9 | |
parent | 1a777cd44a73571ab8040191348d1601585c3f90 [diff] | |
parent | 0616976128b9bc24729a79034c3902492dc9e573 [diff] |
am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken