| commit | 122d55eb0fa2177cedbff58239fa3baa47c7df3b | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 11:09:45 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Oct 10 11:09:45 2010 -0700 |
| tree | 81b14fb82ce8e951b01534e65e8b4bd4bdf6cb94 | |
| parent | 136f52dde79d332658bff24a1f3cd866a8aeb78a [diff] | |
| parent | b141dacaa920712d29c126977148c61e15bb4aa4 [diff] |
resolved conflicts for merge of 5df4b5a7 to master Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2