tree 5d42479cb4954878ee8a9e52d1a2a1ef92d63f36
parent c05cb73074704d1ff0d976ab82595d2f9ac28ff6
parent e9213fdd0563e64ded7b17757c6187741b70260c
author Sasha Smundak <asmundak@google.com> 1547057757 -0800
committer android-build-merger <android-build-merger@google.com> 1547057757 -0800

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

Change-Id: I19ac6aae070dec7b15dd5d8730bd529bd062164c