| commit | 02a171afdb1a5198b22f38ed1b306bb8cc6e7043 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Nov 30 10:13:36 2011 -0800 |
| committer | Jean-Michel Trivi <jmtrivi@google.com> | Wed Nov 30 10:13:36 2011 -0800 |
| tree | ce515b598767c44cfa466c643e886a2e56e5da02 | |
| parent | 4d919aa2a89c65869058a98efcaf9066eab8c125 [diff] | |
| parent | af9b87de97356722370d11d2c5797d75cb43969e [diff] |
resolved conflicts for merge of 2917f475 to master Change-Id: I63f4689fabb2aee1682d785ad9c41f06de380396