tree f8f4977a945151bab5ce919baaf995197d64528d
parent 6a6588b4acada94fd36908c6bf16bc32c7c0a252
parent 62dbb22bd4878369975492c8a1c234840e418a4f
author Marco Nelissen <marcone@google.com> 1266520289 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1266520289 -0800

Merge "Make the simulator boot again."