| commit | d38ecf0bf09bdbdb13a741c00e605a578173fb7e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 15 21:43:14 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 15 21:43:14 2010 -0700 |
| tree | 622d02809ef9f64aa73adf2b074ab3d98c482a78 | |
| parent | a2959d5eec9b5d42b648436f79400eab7d3cdd08 [diff] | |
| parent | 9090c4c1d77d574a7213724314a64f65a458e84c [diff] |
am 9090c4c1: (-s ours) am da21ccf8: Grandfather the simulator-specific modules. do not merge. Merge commit '9090c4c1d77d574a7213724314a64f65a458e84c' * commit '9090c4c1d77d574a7213724314a64f65a458e84c': Grandfather the simulator-specific modules. do not merge.