| commit | ff3d4bc42b22093695896bc319c59b139aa2c6f6 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Mar 11 12:59:56 2011 -0800 |
| committer | Ying Wang <wangying@google.com> | Fri Mar 11 12:59:56 2011 -0800 |
| tree | 45ade9f9662fae11f9301471b3c958ed3f64854d | |
| parent | 5ac5e8d7b5c4707190d367c827a7562b08c8e50d [diff] | |
| parent | 1a6a849bcb4d074113777d78cb769546e7db42b5 [diff] |
resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b