| commit | 284e1954274b708f3cf60ab82cdabe0f4c31d141 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Sep 29 20:51:48 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 01 10:42:11 2010 -0700 |
| tree | 915d4a48d0825eb5d43b63526e4af424346c140d | |
| parent | 6a10d397f311f7816d29e9879eb1c020b8863821 [diff] | |
| parent | 4110368b935e51ebd75fff88492bbef451837383 [diff] |
resolved conflicts for merge of 4110368b to gingerbread-plus-aosp Change-Id: I6a75675ffcb4d9bcb1b7d321a4934b3e3fcca137