tree f0e411c6d18d77c327031ff9e5d406231ddd4203
parent 49f3624a6d3307b640a012f15b94d04174473501
parent 4e06707a716feb421e94de475f4d52e3b98f6bea
author Sasha Smundak <asmundak@google.com> 1547592628 -0800
committer android-build-merger <android-build-merger@google.com> 1547592628 -0800

Merge "Convert Android.mk file to Android.bp"
am: 4e06707a71

Change-Id: I702e17f9dac1c8a9c87af1d02d2e1cea13bfbb73