| commit | 1293bb3f1da75beb5761883c960a36424d72d04d | [log] [tgz] |
|---|---|---|
| author | Chung-yih Wang <cywang@google.com> | Sat Oct 09 08:07:55 2010 +0800 |
| committer | Chung-yih Wang <cywang@google.com> | Sat Oct 09 08:07:55 2010 +0800 |
| tree | 81b14fb82ce8e951b01534e65e8b4bd4bdf6cb94 | |
| parent | 732d47e84837c33f4a6264c845f15be3325d5a45 [diff] | |
| parent | 0422150b1af44e9e3f8eaf511d96a4b8b7cfcd56 [diff] |
resolved conflicts for merge of 4790a2e2 to master Change-Id: I659ccd9a51e24f217f715178a98eaf6592c258d7