| commit | 65dd62a306b733b4891aa455b2e099d9c15fffa8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 13:17:37 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Dec 07 13:17:37 2010 -0800 |
| tree | b25925b21e13ddb153b47e92011a6ef71099ca3a | |
| parent | 1ab60b44e6d1317d168185666b7597ed1c8029d5 [diff] | |
| parent | ee27dd356e7257f553e8aec74d2c7dcbbde8bd5a [diff] |
resolved conflicts for merge of ee27dd35 to master Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7