From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 16 Mar 2011 00:25:29 +0000 (-0700)
Subject: Merge "Whoops forgot to add this file."
X-Git-Tag: android-x86-4.4-r1~2496
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3f5a9b3c4a7a253f522571679ce3a21192e48e6d;p=android-x86%2Fpackages-apps-Settings.git

Merge "Whoops forgot to add this file."
---

3f5a9b3c4a7a253f522571679ce3a21192e48e6d