tree 8ba1bfa89207f0a70d49b6840567bcba5df3cda2
parent b6c3c89d43c0eca3462a3bd0f902c033b8262b33
parent 8bb1ebde1b0abee0688ef695d3bfcbffd4bb637b
author Sasha Smundak <asmundak@google.com> 1547058825 -0800
committer android-build-merger <android-build-merger@google.com> 1547058825 -0800

Merge "Convert Android.mk file to Android.bp" am: 7c18b9609f am: 10d953e9e6
am: 8bb1ebde1b

Change-Id: I5ea5e49c013e525a25a69edb35d82f89ea40bb85