Merge \"Add tests for varying linking by location\" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 13 Jun 2016 21:50:47 +0000 (21:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 21:50:47 +0000 (21:50 +0000)
am: 74079c6d92

Change-Id: If308436e5f03d1aeb6c9a87f1c24bb1ec54edc30


Trivial merge