| commit | 711a0adebc088e68b825ab34148d8e9952fe47a4 | [log] [tgz] |
|---|---|---|
| author | Hung-ying Tyan <tyanh@google.com> | Sat Oct 02 12:42:23 2010 +0800 |
| committer | Hung-ying Tyan <tyanh@google.com> | Sat Oct 02 12:42:23 2010 +0800 |
| tree | 43089c79fd7acffc6c480a2ce0bbf7f15dcd163a | |
| parent | 033091e4b3e58207d02350b0bd2a4264addddef6 [diff] | |
| parent | c493b5d36817d8bb64238502c230d2819c4b8ccb [diff] |
resolved conflicts for merge of 8788d140 to master Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c