tree e5de9546a6fc6c3903625563234d9f26c0ed4298
parent 78a59022f89a65f5e7107d57f4995c1eb70e1fb2
parent 890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48
author Jean-Baptiste Queru <jbq@google.com> 1283973703 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283973703 -0700

am 890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48' into gingerbread-plus-aosp

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