tree ce71f8165c73a72f963a34e41a9d04f86b5c1066
parent 9fd90ff8e6900ff05850852135fee8b8418679ac
parent 2910bbfe73200d0336444a31c2b4163def5ec905
author Dan Willemsen <dwillemsen@google.com> 1495519258 +0000
committer android-build-merger <android-build-merger@google.com> 1495519258 +0000

Merge "Move libdlext_... to NATIVE_TESTS instead of ETC" am: c777139e02 am: 9eefe1b614 am: 8b14282691
am: 2910bbfe73

Change-Id: I9d999f3ff0d5e528f9e7792bc08a6a89003702a4