| commit | bbd03141b4903eda49deb0937a2174ed09f56aa4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 24 14:02:10 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 24 14:02:10 2010 -0700 |
| tree | 4bf5a2505fb1d1a120dd94a4ce4453ea159dd104 | |
| parent | 5002433ba8c12bc7f373e402bf69fea8f1dfed76 [diff] | |
| parent | cbc479c3a64e054ae2c6945cdad14fd0ef789497 [diff] |
resolved conflicts for merge of cbc479c3 to master Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559