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

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

Change-Id: I857b2bf3206c0f4a9b06bb07289eb5796321364f