tree 0869a812b3960b8614d3a4b021a9877dd324fe73
parent 56bfd099003431d4effbaa44b2cac678ff1fef43
parent 18f0405e755b75e5f0532e0d5399629da708b587
author Eric Laurent <elaurent@google.com> 1274816772 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274816772 -0700

am e205dd34: am 06169761: Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken