tree 35c9cfab88fb99ca75bca57d3ad9b6f4aee9f865
parent 9103d0f588f065a26d184b20f773bc0e90641ce2
parent 8322bd4f7294e044aa09b2316c30af75159ea2a1
author Sasha Smundak <asmundak@google.com> 1547264258 -0800
committer android-build-merger <android-build-merger@google.com> 1547264258 -0800

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

Change-Id: I5aeb238974545f6bc7d3ea468eb551d7dceb86bf