| commit | 9439241d35afc203d47b327619a49b5d70cf722b | [log] [tgz] |
|---|---|---|
| author | Chih-Chung Chang <chihchung@google.com> | Wed Aug 25 15:54:51 2010 +0800 |
| committer | Chih-Chung Chang <chihchung@google.com> | Wed Aug 25 15:54:51 2010 +0800 |
| tree | 663b4d539595b4da32de3807276fa8f83d56d2e1 | |
| parent | 96b2516496e9ad0424d99c244d82eee8af3813cd [diff] | |
| parent | 20afae515054ca0d2d4a1cdc169c7faaaa287e40 [diff] |
resolved conflicts for merge of 20afae51 to master Change-Id: Ief637e412e4d716526de68c7761bdb8cbf436333