tree 269b4ca48b3c9e39c31936068f0ae90ef9548e31
parent 7bd1854f15fdbc3276725ca199e3ce26fa258d0a
parent ef8a4f27bd881fb4b666a8d3b4a5aefca847775e
author Sasha Smundak <asmundak@google.com> 1547257337 -0800
committer android-build-merger <android-build-merger@google.com> 1547257337 -0800

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

Change-Id: Idb90e1d1369dce158b55751406f3dfb3b7c5a127