From: Amith Yamasani <yamasani@google.com>
Date: Thu, 8 Aug 2013 23:17:51 +0000 (-0700)
Subject: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev
X-Git-Tag: android-x86-6.0-r1~2114^2~347
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1eb6105f;p=android-x86%2Fpackages-apps-Settings.git

am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev

* commit 'a42cacb34b8b6a5c9c0fd1b6c1ba63a121658d6f':
  Potential fix for Bug: 10241642
---

1eb6105f25dcecde565f9d56e5c87feed7bd520d