From: Ying Wang <wangying@google.com>
Date: Fri, 21 Feb 2014 18:34:44 +0000 (-0800)
Subject: am dd22aee1: am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls
X-Git-Tag: android-x86-6.0-r1~1758^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=387a095f;p=android-x86%2Fbuild.git

am dd22aee1: am 69c3f457: am dc7fee9f: Set up rules to merge AndroidManifest.xmls

* commit 'dd22aee1f4e7acf935cc640fb5ec4fca8db721c1':
  Set up rules to merge AndroidManifest.xmls
---

387a095fbd3c375e93c1c77c974f7bbe462933a6