OSDN Git Service

am 67b50606: Merge "Fix the simulator build." into gingerbread
authorEric Laurent <elaurent@google.com>
Wed, 25 Aug 2010 17:39:21 +0000 (10:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Aug 2010 17:39:21 +0000 (10:39 -0700)
commit3734308dd59c48ac533713bd0ef3a9699c008825
tree0314b93c0f69ae613944b5e5ca4df9908f1217ad
parent19e9ecc8a292d4c2f7b4ba03a685452500e392e3
parent944d8e92c4c3675dfc7c10d6b91219d3c0de35aa
am 67b50606: Merge "Fix the simulator build." into gingerbread

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

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