tree 5df6659b93df0f3980a91cdbcf064e2970d5d8fc
parent e2ce4ef847ffa5ef9ba61cf46a760d9296fad5e2
parent 9f37180f92aff7d2288fca016fcd75ae977b6977
author Sasha Smundak <asmundak@google.com> 1547087319 -0800
committer android-build-merger <android-build-merger@google.com> 1547087319 -0800

Merge "Convert Android.mk file to Android.bp"
am: 9f37180f92

Change-Id: I673a59cadf86ef712f1fcf0e397a0a122585834a