Merge "Get rid of indirection when adding module directories in build"
authorPyry Haulos <phaulos@google.com>
Tue, 27 Sep 2016 15:52:36 +0000 (15:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Sep 2016 15:52:36 +0000 (15:52 +0000)
am: fb175316d0

Change-Id: I7a165eb112c32a9e30069b81204b6e22f526b57a


Trivial merge