| commit | 0d65146bacbf3c0a02455a075c81d24376bf7c4d | [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 | 42fa19b35b019b6698cac93ef94cec9f6b5133e4 | |
| parent | 7c5e2fc15beff5eac34cdeb2b74f71c775996bd5 [diff] | |
| parent | 6f436ed2b9dbc5eb497f6a33f5d871c47616ea3d [diff] |
am 0ba97e3f: am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs" * commit '0ba97e3ff830e3f6045650e0a4bd0d08dad50fcc': stubs