tree 092734c232aa5da033010f587598b1144d72d87e
parent dcf693c8cf6aea0b79b3836a67fa3ab6c9f94ead
parent 3c435fce842f752a8d91164dff2b373b9634910f
author Sasha Smundak <asmundak@google.com> 1547843965 -0800
committer android-build-merger <android-build-merger@google.com> 1547843965 -0800

Merge "Convert Android.mk file to Android.bp" am: ef6c4ed5c8
am: 3c435fce84

Change-Id: Ief8992562565b7c5081f6d4a19a5d66d6796b77d