| commit | 2584c31de479fa27971455b1e70b8e58b754c0e9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 04 14:39:07 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Sep 04 14:39:07 2012 -0700 |
| tree | a30a66592a51f63faaafa5f7bcf9f4190e1f7a07 | |
| parent | d9719732b9e02d1236138d2f76eddf9ca2dbd2b7 [diff] | |
| parent | 0570344a1b3187294250be20e212397e8fd42c88 [diff] |
resolved conflicts for merge of 0570344a to jb-mr1-dev Change-Id: I5853a3609caacf7b0ff0eecbb1ed697811b7430e