tree f7ccce5ec86189c9bd5f85f11fa7b72c82778440
parent df899f64d0dc93d8a9246c3887bf963c5a9f9d7f
parent acebb3266fb03272494b4ca165689336605e2dc8
author Colin Cross <ccross@android.com> 1532642556 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1532642556 +0000

Merge changes from topic "manifest_fixer_targetSdkVersion"

* changes:
  Pass --library to manifest_fixer.py for android libraries
  Fix dependencies for obfuscated instrumentation tests
  Move manifest fixing to a separate rule