tree 5d42479cb4954878ee8a9e52d1a2a1ef92d63f36
parent 99f5639fa4e2b49c7d1cf9518d4f233b14f23ee3
parent 594190a97221a57c4db2acccbbfefdb50cbcf5a9
author Sasha Smundak <asmundak@google.com> 1547058813 -0800
committer android-build-merger <android-build-merger@google.com> 1547058813 -0800

Merge "Convert Android.mk file to Android.bp." am: 4a5064b387 am: e9213fdd05
am: 594190a972

Change-Id: I6ee95b897572e42b95098fe984b809e45f218308