From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 4 Oct 2016 02:17:19 +0000 (+0000)
Subject: Merge "Convert to Android.bp" am: e6be5fc431
X-Git-Tag: android-x86-8.1-r3~54^2~9^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=48dadcacc338e00a086c6858f1cfb7c58281ce97;p=android-x86%2Fsystem-media.git

Merge "Convert to Android.bp" am: e6be5fc431
am: 481030b1e2

Change-Id: I0455356090a92249e669de99d7e963fa4268e0e8
---

48dadcacc338e00a086c6858f1cfb7c58281ce97