tree 83579290c12daedf586c30539c218042338c4a07
parent aff88e309d34b730ae715af7bb1f877e17eed078
parent 7c18b9609f6f6d71fe749749d17c2364cdb4d1bb
author Sasha Smundak <asmundak@google.com> 1547056945 -0800
committer android-build-merger <android-build-merger@google.com> 1547056945 -0800

Merge "Convert Android.mk file to Android.bp"
am: 7c18b9609f

Change-Id: I5c4e964b3e411631c2ce936e95e795b214499bf9