tree 8c008a02a8b5a022153ee8e3d1fb6daf6999e472
parent 8467b008a89597a66100f7381e271342efc4ae02
parent 67b20324c8aea33128f121b6f5d76a8a7927f3c5
author Sasha Smundak <asmundak@google.com> 1555087756 -0700
committer android-build-merger <android-build-merger@google.com> 1555087756 -0700

Merge "Convert Android.mk file to Android.bp"
am: 67b20324c8

Change-Id: I3f9c71108c865c6ee4ae13684ee4e052f7484ba8