tree eb2f41088d040a14946feca1972ebb4f75dbc027
parent c320e634973d69c8d4f893153c37d126f14b5e22
parent 0dda5a191df021a13c91d42109d55f4434b2c5da
author Jean-Baptiste Queru <jbq@google.com> 1283986284 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283986284 -0700

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