| commit | 606540b739599c8f079baa2a03b5f0501b148eb2 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Mon Jul 26 08:53:19 2010 -0700 |
| committer | Evan Charlton <evanc@google.com> | Mon Jul 26 08:53:19 2010 -0700 |
| tree | 1c967bedbe4d89e1d47a34c03b51d0d57ada57fa | |
| parent | 44d628540c248f026bf2f26e8d9c3a17cb52b2b4 [diff] | |
| parent | f2bfa76cf8937cb98b0205da1ed7f8267bd5714b [diff] |
resolved conflicts for merge of f2bfa76c to gingerbread-plus-aosp Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d