| commit | 5af27de0b59b3a49298066a652d9fa37ff71cbf0 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed May 02 15:22:34 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed May 02 15:24:32 2012 -0700 |
| tree | d6ae9f810b4a126cf6dcf8fc18188ecddd6abedd | |
| parent | 9bdc290792f8c5c4e4beb40e6b7f335759b6d6d5 [diff] | |
| parent | 343597c3aa4e17bdba4c911d081a6d161fb1c758 [diff] |
resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7