| commit | 264c2cfe4dc5837213e4b031c13cf9f17025d779 | [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 | 69b246884eafdd2bd1e56e5c57aa7e56a88e73cd | |
| parent | 6fcd10bf4ceec8ceea29a686b922c5343e317263 [diff] | |
| parent | 5df4b5a78b530fb1d8d851e4a833c5acfb3a7a60 [diff] |
resolved conflicts for merge of 5df4b5a7 to master Change-Id: Ib1ed63f79c4a094b1d4ba8ba74ee2bd68a35bfd2