| commit | af6879787211abf181d89df5f622357ff370800d | [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 | fcf60e712c8ec063d65d20af892cd7fd3e822c75 | |
| parent | 5292656c7ae880931501a6dbaf6b901d0921a8a3 [diff] | |
| parent | 05bfbc458c842d86ba855e50ff75e10498cab009 [diff] |
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713