| commit | f2fb8c90fbcfca899b65aeb3e371ac33e4dfc13f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sun Apr 29 07:17:26 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sun Apr 29 07:17:26 2012 -0700 |
| tree | 6f1a82a1f2576a7cd2d6c0a3de47e69b044c3c59 | |
| parent | 8fceda2a5c903b5c3f5a6e95eb931308ebca0896 [diff] | |
| parent | ca64b1a282880841dee8b974b10e3aa26e2dba57 [diff] |
resolved conflicts for merge of ca64b1a2 to jb-dev-plus-aosp Change-Id: Ibbfc6568cb74473157dcc50b0ad500017503ba5b