tree 73482a8e192faa074fb884ec3dbd6e1faac8b30b
parent 33b93edf162764cdd0c7474bb4143b461890e8c3
parent 8414dcc9ab9c62f07bf2da35abe860245d536483
author Sasha Smundak <asmundak@google.com> 1547491855 -0800
committer android-build-merger <android-build-merger@google.com> 1547491855 -0800

Merge "Convert Android.mk file to Android.bp" am: 8dddb7086d
am: 8414dcc9ab

Change-Id: I5d4ce2782411b21a78487bdd3831514fc68d2a05