tree 092734c232aa5da033010f587598b1144d72d87e
parent 3c6a453fb14ea569f53902ce823e5b0dbdf9a08e
parent 4ed4fb4cd97e75bb2f354e7d1f98820fcc75fb75
author Sasha Smundak <asmundak@google.com> 1547844420 -0800
committer android-build-merger <android-build-merger@google.com> 1547844420 -0800

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

Change-Id: If5ac532478646a954b86bf645b823519918f570f