OSDN Git Service

am 130b539b: (-s ours) am 890ef4b0: a few more existing user modules to be grandfathe...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 8 Sep 2010 20:14:04 +0000 (13:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Sep 2010 20:14:04 +0000 (13:14 -0700)
commit1c436bfef3559675b6f2f1677c84850823d29407
tree474109023ae12e38c08724b5493018d7c702683a
parent2d85efaa916624bf4a92f84835b64f6fbe09cf1d
parent130b539bfdda612dd3858b407c503c3e80d9aa72
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