OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Apr 2010 18:43:17 +0000 (11:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Apr 2010 18:43:17 +0000 (11:43 -0700)
commit5ebaf10693725c9dc48219c3c65945b84d74692f
tree5124cb6169287afd69e85a4082cea2dce4d41c22
parentd9b802bd03d0ef4792bc99289f16f6a05bd1ee95
parent392fc3573553b71dc5c2712aca16e262efd33ce9
merge from open-source master

Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java