| commit | f5e5e76065d9dbc6f2334e4bee4af233aaebc14a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 04 09:03:42 2013 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Feb 04 09:03:42 2013 -0800 |
| tree | 56a28a7fd9bf3e9d0f2a4c017e16e85951d95050 | |
| parent | cd02a63f3e82d4a40e32feaf231b37245a01b106 [diff] | |
| parent | 16e6db4c3c96638eb81c89c97c58826247a7c8b1 [diff] |
resolved conflicts for merge of 16e6db4c to jb-mr1-dev-plus-aosp Change-Id: I33f870d3ce6d7855073526d9910ec15de197fd78