OSDN Git Service

am 2ad4d5f3: am 4ee04869: Merge change I12f05ef0 into eclair
authorBrett Chabot <brettchabot@android.com>
Thu, 22 Oct 2009 17:57:52 +0000 (10:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 17:57:52 +0000 (10:57 -0700)
Merge commit '2ad4d5f31be2acdfb487f5e8ccea60d707aab91c' into eclair-mr2-plus-aosp

* commit '2ad4d5f31be2acdfb487f5e8ccea60d707aab91c':
  Add ability to retrieve instrumentations from android_manifest parser.


Trivial merge