tree 49ce9a6eae715e520a49a8b92ad488385c708eb9
parent f5f88a75d6d89c09c48786492791debcf7b3001a
parent cb228be07017b413d2db27f25589bfd80a17dd1a
author Sasha Smundak <asmundak@google.com> 1547265019 -0800
committer android-build-merger <android-build-merger@google.com> 1547265019 -0800

Merge "Convert Android.mk file to Android.bp" am: 93068a3c58 am: 7a336bcdd6
am: cb228be070

Change-Id: I636d7aa8e106e9a880752fae8bb4dde50f218b3e