| commit | 1dac5d491f11885b2fceae177f6bdfa94346b3a6 | [log] [tgz] |
|---|---|---|
| author | Tadashi G. Takaoka <takaoka@google.com> | Sat Oct 16 04:57:53 2010 +0900 |
| committer | Tadashi G. Takaoka <takaoka@google.com> | Sat Oct 16 04:57:53 2010 +0900 |
| tree | 7cec0e718ac7692e8dd684fc32579ea32687765b | |
| parent | 93b3d500410388869d7e0606955453f1a9569088 [diff] | |
| parent | ac7771280d04a2bcea2dda8c7fe5a7b4f2e4c264 [diff] |
resolved conflicts for merge of ac777128 to master Change-Id: Id01a741ca18ac64e31d2abfed5251a1e99d48391