| commit | ce7c05e842d4e35ce180d398ecb969aad18f3460 | [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 | cd2fb1afbeab8f917c636763a12963ba2d858cdf | |
| parent | 85bccf6e0b555bc5245628ba7340123b6b367b51 [diff] | |
| parent | 690d31a6a806fa3d00e568cbbfa0e60415594636 [diff] |
resolved conflicts for merge of 690d31a6 to honeycomb-plus-aosp Change-Id: I1308f0a5fda0646a90dcd60a78c15538c7364cbc