tree 89e7e0b51419abd806fae3e7b73b3627db9ee1ac
parent 2e58fba928d5a2dff00256a14769005a2c998b7c
parent 6c078e0522daafbdb5b2635baa510c2863bde2bb
author Adam Lesinski <adamlesinski@google.com> 1461874541 +0000
committer android-build-merger <android-build-merger@google.com> 1461874541 +0000

Merge "Revert "Call aapt2 link with argument-list"" into nyc-dev
am: 6c078e0522

* commit '6c078e0522daafbdb5b2635baa510c2863bde2bb':
  Revert "Call aapt2 link with argument-list"

Change-Id: I36d1080067620f991766a751830cac885fd1dc48