OSDN Git Service

am 4ee04869: Merge change I12f05ef0 into eclair
authorBrett Chabot <brettchabot@android.com>
Thu, 22 Oct 2009 17:46:22 +0000 (10:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 17:46:22 +0000 (10:46 -0700)
commitebe0a77d9aebaba370cd2db10dc64d0ca8c63e97
treea980aa642909ed542ff9ac142cbcb0d6c54924ee
parent5bf94e81c70da71f429eb1c5db034a0469b014ca
parentbbfd2f0085ffca1b56a0925c696cba4055bff4fa
am 4ee04869: Merge change I12f05ef0 into eclair

Merge commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49' into eclair-mr2

* commit '4ee0486913f0a9a478e829ba33de2eb8bc6e8a49':
  Add ability to retrieve instrumentations from android_manifest parser.