| commit | 01cb25fddeb03d72585ae13a8a1f1721f4bcef8c | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 08:13:10 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Jun 12 08:13:10 2012 -0700 |
| tree | 5994fade94e6234b611ccc8454b903b40349b9f1 | |
| parent | 6e66823873915bfd6e6c7b9b5c92e1e7e010977f [diff] | |
| parent | 29bea61cacd74948c9e13f56ea51ca459652a2c6 [diff] |
resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp Change-Id: If582e1fa99691b4e4182c3a9b148fcef5cad251e