| commit | f1d75a6b035666f473be49a739651d62693c1fde | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 18 10:50:40 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 18 10:50:40 2012 -0700 |
| tree | 59e94dfbce0582d68f26e7bc516cf83fdf3f7cfa | |
| parent | fedf39a816083565c8a3abfa7e16fe41110a4c29 [diff] | |
| parent | 0003d599b36655c66ee643b9033488b15a7e0e4e [diff] |
resolved conflicts for merge of 0003d599 to jb-mr1-dev Change-Id: Id0dab33605112ae0df79fe5b9c5819ebfecf0d4b