From: Sasha Smundak <asmundak@google.com>
Date: Wed, 3 Apr 2019 18:51:12 +0000 (-0700)
Subject: Merge "Convert Android.mk file to Android.bp" am: e6bcf626be
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e280e2e614;p=android-x86%2Fframeworks-base.git

Merge "Convert Android.mk file to Android.bp" am: e6bcf626be
am: 7f0a256a78

Change-Id: Ib00a5e849ecacbdb4a37e49c41def82ab394f7ab
---

e280e2e61497d5ce4fcad0d68c61133dd7c69245