| commit | 1a2c7098c81e04b8c6e37b0937fc59ae29f33055 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Jan 17 14:17:12 2011 -0800 |
| committer | Eric Laurent <elaurent@google.com> | Mon Jan 17 14:17:12 2011 -0800 |
| tree | 96adbfbb698e7e86289f8e7e8f724ad2340c5222 | |
| parent | 5afecb600f4b4ffdc5c6b5e2d2a6ea31a7874aad [diff] | |
| parent | 7d95b378e07c213d0536378e546ff709cef46415 [diff] |
resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b