From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 29 Feb 2016 19:10:03 +0000 (+0000)
Subject: Merge "Update Android.bp with recent Android.mk changes"
X-Git-Tag: android-x86-8.1-r1~296^2~580^2~107
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=85884137d928f855a2feafe589a3a6127278b22d;p=android-x86%2Fbionic.git

Merge "Update Android.bp with recent Android.mk changes"
am: bb3add2125

* commit 'bb3add2125ce4ace0ba053e3c9bb2a8bf3840f47':
  Update Android.bp with recent Android.mk changes
---

85884137d928f855a2feafe589a3a6127278b22d