| commit | 6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 12:35:33 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 12:35:33 2010 -0800 |
| tree | 59ef84b96453817c257961e19363e15ada4986bf | |
| parent | 554eeb6c7426c8c1df551516cff903d69ae94f26 [diff] | |
| parent | b20288680e3708b02197b3dde107ef2c5728e60a [diff] |
resolved conflicts for merge of b2028868 to gingerbread-plus-aosp Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2