| commit | 57f8d4b5b5564fad7a9c7f8a6e5108f31c75056f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed May 09 09:38:40 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed May 09 09:38:40 2012 -0700 |
| tree | a932f1d4194424931c964b96a5f5002b18d3e769 | |
| parent | da0d8534f1a6273a383f1dc631fbaf032674bb4d [diff] | |
| parent | 3919b96eccb6d78f71f6d19b3ebfacec93cbca1f [diff] |
resolved conflicts for merge of 3919b96e to jb-dev-plus-aosp Change-Id: I80571b5f024a4e1abe2606d10e07006f53bbc01f