| commit | 424de1779d54f979593c1d0924fc7890f82b0b33 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 07 15:00:12 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 07 15:00:12 2010 -0700 |
| tree | 49e3527699e1e5c463f5184b3853d5f4b336ecc5 | |
| parent | 3b008f36956c35f58d510ad3da5090cf21a08349 [diff] | |
| parent | 0f085e5a8525f492255d95c71f4e137efae85d01 [diff] |
resolved conflicts for merge of 0f085e5a to gingerbread-plus-aosp Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7