| commit | d6d2de6b3c22f34aed80e36d58ae5c9692bb2933 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Feb 02 16:02:37 2011 -0800 |
| committer | Irfan Sheriff <isheriff@google.com> | Wed Feb 02 16:02:37 2011 -0800 |
| tree | 734619801e8b4a715e3da7e679f4463609386234 | |
| parent | c2c2360bf1c7e005225383ec9fb5c39c0ef88a74 [diff] | |
| parent | ec348b495367d799d9985060f7f070128f142f5f [diff] |
resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp Change-Id: I34d034115362f0f858fb65710165bd6cad2fdbd5