tree 474109023ae12e38c08724b5493018d7c702683a
parent 2d85efaa916624bf4a92f84835b64f6fbe09cf1d
parent 130b539bfdda612dd3858b407c503c3e80d9aa72
author Jean-Baptiste Queru <jbq@google.com> 1283976844 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283976844 -0700

am 130b539b: (-s ours) am 890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '130b539bfdda612dd3858b407c503c3e80d9aa72'

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