tree 8750afeff9d544088b66d6138535fbac2705e656
parent f42dbb026d2cf9965b97cc05d4f9da924a4f9da8
parent b72b9e5332194f64152462cd7dcb5f452b559ebb
author Sasha Smundak <asmundak@google.com> 1547264274 -0800
committer android-build-merger <android-build-merger@google.com> 1547264274 -0800

Merge "Convert Android.mk file to Android.bp" am: 86598f6ab5
am: b72b9e5332

Change-Id: I6a60b17c0badb50e74f171b6aaebbc1389a289a4