OSDN Git Service

am e0cb0fd3: resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 8 Sep 2010 22:51:27 +0000 (15:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 8 Sep 2010 22:51:27 +0000 (15:51 -0700)
commit251ef626bbc78a8b91459a3522e83c0e06499c25
treeeb2f41088d040a14946feca1972ebb4f75dbc027
parent0c312bfa37eee787876d173b16d67823218c6e5e
parente0cb0fd3f5c9626d90ea6907e63530d8e05067f9
am e0cb0fd3: resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp

Merge commit 'e0cb0fd3f5c9626d90ea6907e63530d8e05067f9'

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