OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)
commitd7b814188df4765e42a34ce94182ef5021ef8f16
treee195e3100646dedc236c2e45decbb9ab22536e3d
parent51a9839ec69aab2800718c069bb76b480ac3c133
parent4bd00732998fdefabfa0720e3d03fb522eb5e249
merge from open-source master

Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
core/java/android/provider/Settings.java