tree b71e2e3a3bf3afe8679456c85c5d2d94ff88d050
parent 5e9db4a5689d2ff3bd2668bbf78b912753eb55a7
parent 6d180d8c972db925c8534f344b3498f4aa55506d
author Sasha Smundak <asmundak@google.com> 1547264497 -0800
committer android-build-merger <android-build-merger@google.com> 1547264497 -0800

Merge "Convert Android.mk file to Android.bp" am: 8322bd4f72
am: 6d180d8c97

Change-Id: Ib3b8418538770b1f57106f3c14c296845d796a1c