tree f0e411c6d18d77c327031ff9e5d406231ddd4203
parent 49f3624a6d3307b640a012f15b94d04174473501
parent 224ed806295519e60d60f2d5e45f58e434958242
author Sasha Smundak <asmundak@google.com> 1547593606 -0800
committer android-build-merger <android-build-merger@google.com> 1547593606 -0800

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

Change-Id: I074f90b148b8c84b5b38fc9a39b28b72f8f44a39