tree 97db4c399c3cf7daf442c4f44b086db6ac72d4d7
parent 7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758
parent cd295c11abca8efad31e68e39e0de83bc1faba7e
author Eric Laurent <elaurent@google.com> 1282757847 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1282757847 -0700

Merge "Fix the simulator build." into gingerbread