OSDN Git Service

am 4ec5a747: am 2ad4d5f3: am 4ee04869: Merge change I12f05ef0 into eclair
authorBrett Chabot <brettchabot@android.com>
Thu, 22 Oct 2009 18:08:50 +0000 (11:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 18:08:50 +0000 (11:08 -0700)
commit8a757fd0bd2bb336939c7ca8cb695b9533ab5f25
tree3b3b79310e14f33dee85ca5a69a6ffc9fb5d845f
parentce05003d8c703be020cbacd71747112b818b3184
parent7145b03ed4f9dd7ab1a6a1e08c3c368ff7114edc
am 4ec5a747: am 2ad4d5f3: am 4ee04869: Merge change I12f05ef0 into eclair

Merge commit '4ec5a74731ce3b8cd0fa0073ef73009515df134d'

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