| commit | 0ba97e3ff830e3f6045650e0a4bd0d08dad50fcc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Feb 11 10:16:45 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 11 10:16:45 2011 -0800 |
| tree | 284ec1c97e2c3895106d543aba7dcda223aa30f7 | |
| parent | e8d074d763f1c9551c41654589597e45476d27e0 [diff] | |
| parent | 6d104f118a59e276eb577ae322f29c2ff8a5015a [diff] |
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs" * commit '6d104f118a59e276eb577ae322f29c2ff8a5015a': stubs