| commit | b91f20af989649dd04652e95a9cfb9f85f4e7086 | [log] [tgz] |
|---|---|---|
| author | Katie McCormick <kmccormick@google.com> | Thu Feb 10 12:38:07 2011 -0800 |
| committer | Katie McCormick <kmccormick@google.com> | Thu Feb 10 12:38:07 2011 -0800 |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 | |
| parent | 31e6d2e0d3fcc804fe61f6008f092db1301cf72b [diff] | |
| parent | 5ffcfb88f0bc2095fec08b8b79bc1754408187a4 [diff] |
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc