OSDN Git Service

am 87e2b990: am 3f4f8ad0: am 98c2591a: (-s ours) merge from open-source froyo
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Jul 2010 18:34:18 +0000 (11:34 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Jul 2010 18:34:18 +0000 (11:34 -0700)
commitc596465b1a2bf0afe723fad139164b6aaee184da
tree8c02af82a7bc04a7ea82b2f3803ad3f73d56e18a
parent4b851a75f7712086a9fc4427f68c99b83725f37d
parent87e2b990f7eb59588970399d85e4bcda67dba76f
am 87e2b990: am 3f4f8ad0: am 98c2591a: (-s ours) merge from open-source froyo

Merge commit '87e2b990f7eb59588970399d85e4bcda67dba76f'

* commit '87e2b990f7eb59588970399d85e4bcda67dba76f':
  Add/Remove Some @KnownFailure Annotations