tree 9f37287817f976950a818ee47e4ae81ec287fa34
parent e10123e4b96fe90d430f2b0ffa0d5151f7f2f004
parent 4b155f3f12477ca782d86afd10c482953a9e89a1
author Sasha Smundak <asmundak@google.com> 1547419009 -0800
committer android-build-merger <android-build-merger@google.com> 1547419009 -0800

Merge "Convert Android.mk file to Android.bp" am: 069ba8677d
am: 4b155f3f12

Change-Id: I056fd7a439cea1d80294686b5aa862b106ccadeb