tree b3e5cc4b9089e58494f41f9f1ed45230cd9f1d60
parent 445d40e55cbb432b5682a0df54e42b3d5285d57f
parent bd3f0f1f0b127393f6ccee8570969f7cab00e746
author Sasha Smundak <asmundak@google.com> 1549637244 -0800
committer android-build-merger <android-build-merger@google.com> 1549637244 -0800

Merge "Convert Android.mk file to Android.bp" am: 5656a003e6 am: abff539b0d
am: bd3f0f1f0b

Change-Id: I1b7f0d115140d9a449a82fa302ffa0c4f09ed52c