| commit | aa7fb3be1b456a2884c3fa707aa590196b2c70c3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 13 09:06:44 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 13 09:06:44 2012 -0700 |
| tree | 86b584e9befc00bb162520f45056a5bb929f0959 | |
| parent | af56ac19545ff083ceb3c1ddf4bf8e2663d4b934 [diff] | |
| parent | 0c2e5705d8ed926b4735e07f40b356f731b60093 [diff] |
resolved conflicts for merge of 0c2e5705 to jb-mr1-dev Change-Id: Iee1d877788b9397ca29a6cfe7bc3015c3edbe5ac