| commit | acbbd1142db522b15d06d6a1e076463e5c55c8b3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 20 14:57:23 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Aug 20 14:57:23 2012 -0700 |
| tree | ad656ed1dc6d720ce90ff2e577c6bde8ea0510da | |
| parent | 7b7feee80331deed883602d5861074ca66293e9c [diff] | |
| parent | 4ea6a8eb9fdf83f5327e6c8b65a3d5dac8075f8f [diff] |
resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev Change-Id: I51b1732011f31ea07087ef0898b47de8977074de