tree 419921cec007fe4897eefec7dacaf385782ab625
parent 44456bb92d84771e394542de7e208d50e495ce8e
parent cc1830225494d539ea02ab712b0adacb7433cfdb
author Dan Willemsen <dwillemsen@google.com> 1491930390 +0000
committer android-build-merger <android-build-merger@google.com> 1491930390 +0000

Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am: 4e80c0077a
am: cc18302254

Change-Id: I2f9d38d79b2907e0354140e7f6a80e32e2f6676b