| commit | f50b9c4c85d2e6481f20c76cd14d8ac9f5f776f1 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Tue Mar 08 14:12:25 2011 -0800 |
| committer | Ed Heyl <ed@google.com> | Tue Mar 08 14:12:25 2011 -0800 |
| tree | 04f948e7a8e20cd5d84da4c507e5986bec7ab86f | |
| parent | b9c627c6a0c6f0af57d0912175bfc739b0eb6249 [diff] | |
| parent | 24297cabf4cd530e4ed4dc10db5cbc68f9ac7c7c [diff] |
resolved conflicts for merge of 24297cab to gingerbread-plus-aosp Change-Id: Ia10a4601b7156f6379d1663d811af45103ff81ff