From: Andres Morales <anmorales@google.com>
Date: Wed, 15 Oct 2014 03:06:03 +0000 (+0000)
Subject: am b6f81772: am 0d4a8ce2: am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_wi... 
X-Git-Tag: android-x86-6.0-r1~1385
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=07f317199e1c261e4edb4bd8b4766672f686aea2;p=android-x86%2Fpackages-apps-Settings.git

am b6f81772: am 0d4a8ce2: am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit 'b6f8177251fbbcec752f1de81ee760eae8f3fcef':
  Set layout_width in WiFi+NFC resource
---

07f317199e1c261e4edb4bd8b4766672f686aea2