tree 33c9e3c4c47b5faa5fe618db1776c9bf6a7d3783
parent 44b31fdd86053945e1eeb3b91783577aebd95b55
parent 67b506065e9fe3c56e3d1b47eedfa01170d574f9
author Eric Laurent <elaurent@google.com> 1282757961 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282757961 -0700

am 67b50606: Merge "Fix the simulator build." into gingerbread

Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp

* commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9':
  Fix the simulator build.