am 37a5ecfb: resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp

Browse Source

* commit '37a5ecfb84673673ba19893a7dfdb51d8c6406bd':
  HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE

...

This commit is contained in:

Benoit Goby 2012-01-13 12:08:12 -08:00 committed by Android Git Automerger

parent f124435c46 37a5ecfb84

commit efa5c400e9

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