| commit | 09ab7ef9f76d7e1a614ee8a8be915d06894f8d37 | [log] [tgz] |
|---|---|---|
| author | Michael Wright <michaelwr@google.com> | Mon Apr 29 22:50:43 2013 -0700 |
| committer | Michael Wright <michaelwr@google.com> | Mon Apr 29 22:50:43 2013 -0700 |
| tree | 2e2aed0fdeda463536d305955d3a9c918b14e0cc | |
| parent | fd0b0072db6d89c85a5ea20383a1c3dc289d1d38 [diff] | |
| parent | b3f6687756ffb660f834ef673bed04b2d4a26d21 [diff] |
resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d