| commit | 252b36379fedd0c91125679170a56d080d05ae9f | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Sat Aug 21 13:50:54 2010 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Sun Aug 22 11:57:58 2010 -0700 |
| tree | 647194a186b497b4c03fd6dbf0f188811d74da36 | |
| parent | 385a655b8e8bf85024e4f24f1d7f6c2d7d7e900d [diff] | |
| parent | a842d143d2dcad07906830a30deaf0ffce86f5d9 [diff] |
resolved conflicts for merge of a842d143 to master Change-Id: I60bba17630d4a4aff5cb8ac9c8b81a2a1fddcd3b