| commit | 7a652bc86a5c7a2b201a48d5c1cfcc9af5d6624f | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Jun 20 12:15:24 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Mon Jun 20 12:15:24 2011 -0700 |
| tree | 32fceb2db600ba289219456b7f452a6617fd9329 | |
| parent | b2dba9910b6bcd26d4d5318b9ee63668ecf39e66 [diff] | |
| parent | b427f0e6965d21b1830ed3598b9686144db79778 [diff] |
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713