| commit | afddd2a070d21ca6a9a1fb1fb9cb8909bdd46036 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jan 31 14:00:52 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 31 14:00:52 2011 -0800 |
| tree | 957967ca93cd09aaa03a41ad7719f195496065a4 | |
| parent | 57b0d2cf06c318890f7ec6c71f6a7abdcc9dc2a8 [diff] | |
| parent | 9d0925821778bd4f91d1c5eb187bb9a62fc84891 [diff] |
am 27badee3: (-s ours) am a6fb375c: am 056340ac: Merge "stubs" * commit '27badee3f567015183ab584fae1cbd32a996e78d': stubs