| commit | 8c14ddd7bc6da11c44acf0c866ef17126fb0afbf | [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 | 75d47cdcbb7eadf0f96aa8203158ca157cc4a260 | |
| parent | 50763119563ce2e6c7c26eb851fc9ddf0fee5b9d [diff] | |
| parent | 514c70a790f8ef8eec5797ba438cd0ced4a38022 [diff] |
resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812