| commit | feec98b139d2ca0b0164a5e178e75ce88b8f492f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed May 16 13:18:39 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed May 16 13:18:39 2012 -0700 |
| tree | 5f3fabe21a06e92d94f179c4bed05de7d937b949 | |
| parent | f760bcbae298d63a53c710cf8857de6174857e25 [diff] | |
| parent | 62855a83b86c0b40583888f93d8b054c7d8ac99c [diff] |
resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07