| commit | 996d60e3a5abe29479b741bd1b346977e4c101aa | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Sat Jan 29 09:32:04 2011 -0800 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Sat Jan 29 09:32:04 2011 -0800 |
| tree | a05927daa315c5338b5424e1916c5a98272f9a13 | |
| parent | 72a95b97e976f53f77cb6c974e5574d807f62f2f [diff] | |
| parent | 36165a676a2c742cc049f738795adced39449255 [diff] |
resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963