tree b5b4cb92e2202e8622c55ac4521f8f24765c2ab5
parent ad11ecfbbc667ae1cb98811a57a67d1548d9cc34
parent 22f0b9d1ae78dda1e19a560a208a14e9e92da453
author Dan Albert <danalbert@google.com> 1483737051 +0000
committer android-build-merger <android-build-merger@google.com> 1483737051 +0000

Merge "Unversion NDK stub libraries." am: ddc7ac8ba6 am: e2b4d4a38a
am: 22f0b9d1ae

Change-Id: Ie6abad6c56a55cd67c22903cd9d60bd907d45e9b