| commit | 738aadd70fb96491e34645e78241eeb04ee83460 | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Thu Sep 30 16:29:13 2010 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Thu Sep 30 16:29:13 2010 -0700 |
| tree | f888fbac4e1fea77878279b03e29ae0438cc42b3 | |
| parent | 5d3cef8a6d1baec29512764b9e0ba240ccd7fcfe [diff] | |
| parent | 0a972acf85ce0cf7bba5a77628e9cf59a0946bd0 [diff] |
resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812