| commit | 8c33c556819df9ecc112f26bf9fa5794aca6e32c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 15:24:11 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 15:24:11 2010 -0700 |
| tree | edeb5f4254e4d11b9835b1f00fb7acc8be73e5a4 | |
| parent | 35c0884b269b8e7c6409ad2f0e47232c8fc4fdbd [diff] | |
| parent | ca111553ed8b38a5beb65bedd8aa38dd874e589a [diff] |
resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aosp Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c