tree 9f37287817f976950a818ee47e4ae81ec287fa34
parent 08bd3b50af673adc8f9aec5c37fcd40f8feea0fd
parent 069ba8677d3881928fb8e8f4bc425eaba6808b40
author Sasha Smundak <asmundak@google.com> 1547418774 -0800
committer android-build-merger <android-build-merger@google.com> 1547418774 -0800

Merge "Convert Android.mk file to Android.bp"
am: 069ba8677d

Change-Id: If2d4cd88fa5103fa8da663f5a1159367474e8ec0