tree fad50f95c4f980ecbd89cb40ebc961b05117d1cb
parent 18b882396683c72af2ee8ab23f784f35f32e3495
parent c68c18b32a339cc348c58b0a01cce6d584398875
author Sasha Smundak <asmundak@google.com> 1547578823 -0800
committer android-build-merger <android-build-merger@google.com> 1547578823 -0800

Merge "Convert Android.mk to Android.bp." am: b0b6ab038c
am: c68c18b32a

Change-Id: I4061689715a4f54846655080e52b70c3d2e0c0c9