OSDN Git Service

am da21ccf8: Grandfather the simulator-specific modules. do not merge.
authorJean-Baptiste Queru <jbq@google.com>
Thu, 16 Sep 2010 03:05:41 +0000 (20:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Sep 2010 03:05:41 +0000 (20:05 -0700)
commit9090c4c1d77d574a7213724314a64f65a458e84c
treebdbd6c0bdbf438fc8406f505fcc6ef610bb0aa74
parent05ad00eac9edda58c5cd3110853a6b93d6cc4e89
parentda21ccf86c31fb060b5a259342fb0bfbb0362f8b
am da21ccf8: Grandfather the simulator-specific modules. do not merge.

Merge commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b' into gingerbread-plus-aosp

* commit 'da21ccf86c31fb060b5a259342fb0bfbb0362f8b':
  Grandfather the simulator-specific modules. do not merge.
core/user_tags.mk