commit | 3f4f8ad0ff9a603419b66d6672cc00bb69b35d78 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Jul 14 11:29:03 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 14 11:29:03 2010 -0700 |
tree | f38780b8fd4a76b6f87e6861fdc3621f50ed7b54 | |
parent | 856d111c4c87e4b47c71954dc6548e636295ea50 [diff] | |
parent | 98c2591a3de16682c957edc0d4fd3d10aacb3cb9 [diff] |
am 98c2591a: (-s ours) merge from open-source froyo Merge commit '98c2591a3de16682c957edc0d4fd3d10aacb3cb9' into gingerbread * commit '98c2591a3de16682c957edc0d4fd3d10aacb3cb9': Add/Remove Some @KnownFailure Annotations