tree 6ffd29de522b26b5e678ac9e4784d85896ea08ea
parent 42ea4dc6d1fc2206a7778029070ed9213e3b0fbf
parent 5bdef0eb24b2536f102fd37e3beb4570c587827e
author Sasha Smundak <asmundak@google.com> 1547543641 -0800
committer android-build-merger <android-build-merger@google.com> 1547543641 -0800

Merge "Convert Android.mk file to Android.bp" am: 9d9163f90c
am: 5bdef0eb24

Change-Id: I74b1f02f9f2874772a0317fc7f828fa363800237