OSDN Git Service

am 0dda5a19: (-s ours) a few more existing user modules to be grandfathered in -...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 8 Sep 2010 22:51:24 +0000 (15:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Sep 2010 22:51:24 +0000 (15:51 -0700)
commit0c312bfa37eee787876d173b16d67823218c6e5e
treeeb2f41088d040a14946feca1972ebb4f75dbc027
parentc320e634973d69c8d4f893153c37d126f14b5e22
parent0dda5a191df021a13c91d42109d55f4434b2c5da
am 0dda5a19: (-s ours) a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '0dda5a191df021a13c91d42109d55f4434b2c5da'

* commit '0dda5a191df021a13c91d42109d55f4434b2c5da':
  a few more existing user modules to be grandfathered in - DO NOT MERGE