| commit | d3bbcaff6f0e08db0412d92f42562a2826a58bec | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 20 10:22:33 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 20 10:22:33 2012 -0700 |
| tree | 0f2ff8b428e9eed40c59f2287c90b54806cfb963 | |
| parent | 0adc8f260023ec25c31ff4ceadde047528cb64ab [diff] | |
| parent | 21938749faf2c4dd0c77bee3dec1f7a85780c85a [diff] |
resolved conflicts for merge of 21938749 to jb-mr1-dev Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f