tree 54bd2e57d8eb832b2448925a2ba4ef20d832f6d3
parent 119d41c18e9a6ea7f04fd3fa65ab2016fb8c6ac9
parent 5783dea0650e96f4b58997d62705f984a12b1e78
author Colin Cross <ccross@android.com> 1469703220 +0000
committer android-build-merger <android-build-merger@google.com> 1469703220 +0000

Merge \"libnativeloader: convert Android.mk to Android.bp\"
am: 5783dea065

Change-Id: I347c0822bbfcc351a36154391c4cd1bcaa3fc7c2