| commit | a57afb6a6c9f4fb451535c3d6f49c3bdf4b59125 | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Tue Sep 28 12:17:44 2010 +0800 |
| committer | Hung-ying Tyan <tyanh@google.com> | Tue Sep 28 12:17:44 2010 +0800 |
| tree | f08d30ca074de4d1247bef04b806e6f14420b674 | |
| parent | 747eb00eef784f7df746e61e7e714e4e422eb6d1 [diff] | |
| parent | 2a36a778d384403cd92b1016ed5c860d3f2c3521 [diff] |
resolved conflicts for merge of 2a36a778 to master Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3