| commit | 1ccb98835ab811253be0304b669eff9aba6db93e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 13:20:08 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 13:20:28 2010 -0700 |
| tree | edeb5f4254e4d11b9835b1f00fb7acc8be73e5a4 | |
| parent | 8c33c556819df9ecc112f26bf9fa5794aca6e32c [diff] | |
| parent | 617570672dfd6ba1ddc3ec8e0d366d35e6cd1583 [diff] |
DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp Change-Id: I29703133654f0f80a4425914d290e9dc50cbc3cc