From: Irfan Sheriff <isheriff@google.com>
Date: Wed, 7 Mar 2012 19:22:06 +0000 (-0800)
Subject: Merge "P2p UI fixes"
X-Git-Tag: android-x86-4.4-r1~1710
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb0c3c60dc49cca3aa694e735e313d0723ed7d3c;p=android-x86%2Fpackages-apps-Settings.git

Merge "P2p UI fixes"
---

bb0c3c60dc49cca3aa694e735e313d0723ed7d3c