| commit | ff6d6fd6ba1733e68a474660a06153ecc9d3e329 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 21 15:23:12 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 21 15:25:55 2012 -0700 |
| tree | 0b44a50a40922fb0c64f208669cf81fc70a35156 | |
| parent | 25f77078569653d00412c74db9d6dcb1576880ac [diff] | |
| parent | 5b255c6100e966b32e5e78a006b99210244d377d [diff] |
resolved conflicts for merge of 5b255c61 to jb-mr1-dev Change-Id: I0e71ee46547e1dfa075c4b9b8cc9fab137932517