From: The Android Automerger <android-build@android.com>
Date: Fri, 22 Mar 2013 14:50:31 +0000 (-0700)
Subject: merge in master-release history after reset to master
X-Git-Tag: android-x86-6.0-r1~2114^2~332^2^2~2^2^2^2~1^2~1^2~1^2^2^2^2^2^2^2^2~1^2^2^2~1^2^2^2^2^2^2^2~1^2^2^2^2^2~1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1499c4eb1f4956e918db17d9120fc9d40a94ebe2;p=android-x86%2Fpackages-apps-Settings.git

merge in master-release history after reset to master
---

1499c4eb1f4956e918db17d9120fc9d40a94ebe2