tree 269b4ca48b3c9e39c31936068f0ae90ef9548e31
parent 31fa8d9cf9e25ffd98956bbd63de9985b5d6fad9
parent b8e66deb93735878f83ecf2064a42ba34b6a0dd5
author Sasha Smundak <asmundak@google.com> 1547259984 -0800
committer android-build-merger <android-build-merger@google.com> 1547259984 -0800

Merge "Convert Android.mk file to Android.bp" am: ef8a4f27bd
am: b8e66deb93

Change-Id: Ie4bad4c3c4e431c94ffbdd2ddc0422ebdaeac5d6