| commit | c596465b1a2bf0afe723fad139164b6aaee184da | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 14 11:34:18 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 14 11:34:18 2010 -0700 |
| tree | 8c02af82a7bc04a7ea82b2f3803ad3f73d56e18a | |
| parent | 4b851a75f7712086a9fc4427f68c99b83725f37d [diff] | |
| parent | 87e2b990f7eb59588970399d85e4bcda67dba76f [diff] |
am 87e2b990: am 3f4f8ad0: am 98c2591a: (-s ours) merge from open-source froyo Merge commit '87e2b990f7eb59588970399d85e4bcda67dba76f' * commit '87e2b990f7eb59588970399d85e4bcda67dba76f': Add/Remove Some @KnownFailure Annotations