| commit | 22e78eb934392f34c20c2abd9c40e41890480a12 | [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 | 12a552a7b5527f5337adab29948ca5123dfbece3 | |
| parent | 09a107d3d09d1e3d4b31a38fb44d783f163b6e76 [diff] | |
| parent | 907b884345116f56859432a45fa89e1e8e5e7a5f [diff] |
resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c