tree 36bfb650d3335f913200d82487f218327e374f99
parent 1e5d8a500dce6530a99cb952681889042dcfb63a
parent 6cba44e3cac333a20446c12fd5f5a4a57792652d
author Sasha Smundak <asmundak@google.com> 1547267754 -0800
committer android-build-merger <android-build-merger@google.com> 1547267754 -0800

Merge "Convert Android.mk file to Android.bp" am: c6ef1d2dc0 am: fb9b1617d6
am: 6cba44e3ca

Change-Id: I4c76dc88bdcc24f4ff9129056b8c18a891d7f436