| commit | 6ef33cb3b8c9ec8f6c2bb387d9a61affea64ec0d | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Mon Oct 04 14:13:54 2010 -0700 |
| committer | Scott Main <smain@google.com> | Mon Oct 04 14:13:54 2010 -0700 |
| tree | 44aaf18088b0da0662c23d7c0c48d57b588f0415 | |
| parent | ec80d7f311b1a0899bb4caf5b380b07027e902d1 [diff] |
docs: fix error in merge caused by Ibd81091fc6002a77ce43f553b63facec53f16a38 Change-Id: Ic46ba89cfd0566fea792f65dfa130bef7010b164