OSDN Git Service

Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4...
authorEric Laurent <elaurent@google.com>
Tue, 25 May 2010 19:42:53 +0000 (12:42 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 25 May 2010 19:42:53 +0000 (12:42 -0700)
commitdee5c2a3dc3a34ad9f285d7e769dca9dead614c9
tree9d11e5f9ee406798070a5cb335390147ae1dffa5
parent642042369516549d2ca077daf3f5e2409885522a
Merge "Fix the simulator build broken by commit 5fe37c6838de9fbd959ad19ba44aa3d00d1b4e6f" into kraken