From: Ying Wang <wangying@google.com>
Date: Fri, 21 Feb 2014 18:35:01 +0000 (-0800)
Subject: am e6a65a5f: resolved conflicts for merge of b6d53f0b to master
X-Git-Tag: android-x86-6.0-r1~1741^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2c20a0cb;p=android-x86%2Fbuild.git

am e6a65a5f: resolved conflicts for merge of b6d53f0b to master

* commit 'e6a65a5f15695f4e601110979dc6861773c3444d':
  Clean up dangling module names
---

2c20a0cb3b4cc8c4e8eeb4c6843a0ba5905a08eb