| commit | a5338831fac0761ba5de851f8ecde2bec5fdbddb | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Mon Jun 06 15:33:37 2011 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Mon Jun 06 15:33:37 2011 -0700 |
| tree | c790c5fc8fa491fd5310bfe40fd410317fc45515 | |
| parent | d2f99b158d496b9cde34eeb2b43c6d18af2cd0c7 [diff] | |
| parent | 076e66034f2a83ecf4bfe4b9b555622d0735709f [diff] |
resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275