| commit | 6e85ad7d267f47ba3a367651a70d147725dc26ae | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 12:20:36 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jun 11 12:20:36 2012 -0700 |
| tree | 5ab9d6dcfa3816a64ffd5ba5885343f38bc0416e | |
| parent | 7372505e2f450f722afc07a1b2b0e28390150ad7 [diff] | |
| parent | 80d21f2f834efe84ba7f3eb0b1159ffa889beb20 [diff] |
resolved conflicts for merge of 80d21f2f to jb-dev-plus-aosp Change-Id: I44b2ba647fb3b208119d10aed3fa6fc85dddfb0d