OSDN Git Service

am 9090c4c1: (-s ours) am da21ccf8: Grandfather the simulator-specific modules. do...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 16 Sep 2010 04:43:14 +0000 (21:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 04:43:14 +0000 (21:43 -0700)
Merge commit '9090c4c1d77d574a7213724314a64f65a458e84c'

* commit '9090c4c1d77d574a7213724314a64f65a458e84c':
  Grandfather the simulator-specific modules. do not merge.


Trivial merge