| commit | efa5c400e9a1020ced9d03e7d53e09600cff78d8 | [log] [tgz] |
|---|---|---|
| author | Benoit Goby <benoit@android.com> | Fri Jan 13 12:08:12 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 13 12:08:12 2012 -0800 |
| tree | d0bceef36b11df5e8750cdf54d215e8f0fd54656 | |
| parent | f124435c4604ad5746135acca5cbc682bedba847 [diff] | |
| parent | 37a5ecfb84673673ba19893a7dfdb51d8c6406bd [diff] |
am 37a5ecfb: resolved conflicts for merge of f134ee36 to ics-mr1-plus-aosp * commit '37a5ecfb84673673ba19893a7dfdb51d8c6406bd': HACK: Export androidboot.modelno as ro.boot.modelno -- DO NOT MERGE