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