| commit | cfcb55d3f52dda601a8fe076d783cdb3338412a2 | [log] [tgz] |
|---|---|---|
| author | Roy West <rwest@android.com> | Mon Oct 18 19:57:59 2010 -0700 |
| committer | Roy West <rwest@android.com> | Mon Oct 18 19:57:59 2010 -0700 |
| tree | 9cddfe93b42ca3e75fcee36a1d85ca7a847f42a2 | |
| parent | 82884deb0ebf452086484b845d46545172933255 [diff] | |
| parent | 98f3aff3c5cc46409ae06910dcec76bfd6faa1b4 [diff] |
resolved conflicts for merge of 98f3aff3 to master Change-Id: Icfc107998728e8571cf1e887027ab0067f3d40f8