Merge commit '1bb52f25870a0f183b9c5a24362c2468fb316435' * commit '1bb52f25870a0f183b9c5a24362c2468fb316435': Fix ADT junit test for AndroidManifestParser following API change.
Merge commit '1bb52f25870a0f183b9c5a24362c2468fb316435' * commit '1bb52f25870a0f183b9c5a24362c2468fb316435': Fix ADT junit test for AndroidManifestParser following API change.