| commit | ec348b495367d799d9985060f7f070128f142f5f | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Feb 02 14:23:10 2011 -0800 |
| committer | Irfan Sheriff <isheriff@google.com> | Wed Feb 02 14:23:10 2011 -0800 |
| tree | 61d5ab60b689f7703443df754e8b13569a47b5c0 | |
| parent | f6b2beaabda6607b1c60dccaff038e9b59733821 [diff] | |
| parent | 0a4b3fd93b2de21de0684a8291663920d9099170 [diff] |
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c