am e0cb0fd3: resolved conflicts for merge of ba3ed0c7 to gingerbread-plus-aosp

Browse Source

Merge commit 'e0cb0fd3f5c9626d90ea6907e63530d8e05067f9'

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

...

This commit is contained in:

Jean-Baptiste Queru 2010-09-08 15:51:27 -07:00 committed by Android Git Automerger

parent 0c312bfa37 e0cb0fd3f5

commit 251ef626bb

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available