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

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

Change-Id: I34059d7e95e063e02f2922f75675058f11c33248