commit | 87e2b990f7eb59588970399d85e4bcda67dba76f | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 14 11:32:04 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 14 11:32:04 2010 -0700 |
tree | 9e30eba5372383fa3e338763c84953dde73a2893 | |
parent | c62fc717b34e0735965101f76a677c170363569a [diff] | |
parent | 3f4f8ad0ff9a603419b66d6672cc00bb69b35d78 [diff] |
am 3f4f8ad0: am 98c2591a: (-s ours) merge from open-source froyo Merge commit '3f4f8ad0ff9a603419b66d6672cc00bb69b35d78' into gingerbread-plus-aosp * commit '3f4f8ad0ff9a603419b66d6672cc00bb69b35d78': Add/Remove Some @KnownFailure Annotations