| commit | 30be93c6e2b5c2eb6c6e9e21a04dc0dbe2f4c8ca | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jul 29 15:55:34 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 29 15:55:34 2010 -0700 |
| tree | 0393f272d9cd62aaef4a1a515897ff97206d60c2 | |
| parent | 69f2d3ce91f18dd20441dc4c51839add63cac3e1 [diff] | |
| parent | 60c8f863ca84f3e5bb8e78d8001c53511f094d53 [diff] |
am 60c8f863: resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp Merge commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53' * commit '60c8f863ca84f3e5bb8e78d8001c53511f094d53': Userland support for VM interconnection