| commit | ff80940ae8358f49efbbb2d989b02e4b23dd1930 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 25 14:32:29 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 25 14:32:29 2012 -0700 |
| tree | 451de8e746a15186f23dcead2d18ced6f32e5b5b | |
| parent | 2b5c39f5942d6b9b0a85d460f941ed419452e696 [diff] | |
| parent | 343fe48adedd23a5b5b9ef86da911ec2276bd31e [diff] |
resolved conflicts for merge of 343fe48a to jb-dev-plus-aosp Change-Id: I9b3379ec26c3a0fb208b8cdd66a0b60088c1b01d