| commit | 6f436ed2b9dbc5eb497f6a33f5d871c47616ea3d | [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 | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
| parent | b74048a88477019968d6f6426fac7432e37e73d4 [diff] | |
| parent | fd32f41763f1dc2e30a32f087cc2cf726050df34 [diff] |
am 6d104f11: (-s ours) am 6901f963: am 93552de8: Merge "stubs" * commit '6d104f118a59e276eb577ae322f29c2ff8a5015a': stubs