| commit | 3fc1f85a37571b2609184e88bedfb929fa7bd22f | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Fri Jun 03 10:26:15 2011 +0900 |
| committer | satok <satok@google.com> | Fri Jun 03 10:26:15 2011 +0900 |
| tree | 52204070590f98ff603d6fb806a8e17e2a992800 | |
| parent | 507fc54924af53635e8d5520e5836c046af00775 [diff] | |
| parent | 7e2181c0de51bd3671838c2e425e3b02973246fa [diff] |
resolved conflicts for merge of 7e2181c0 to master Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0