commit | 2bdc3e1a2f172c4e7de3e31cdd80c9ab5a605ce1 | [log] [tgz] |
---|---|---|
author | Eric Laurent <elaurent@google.com> | Tue May 25 12:46:12 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 25 12:46:12 2010 -0700 |
tree | 658ae788ef5d964f614d6f10b6427a82e6dbfc34 | |
parent | bb3a8c5ea2cd4cad794d99ee28574cb5d855cff4 [diff] | |
parent | e205dd34a52a05b5037dfb8979190b234d5557dd [diff] |
am e205dd34: am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken