OSDN Git Service
Jason Chen [Fri, 16 Mar 2012 21:19:03 +0000 (14:19 -0700)]
am
dd6c0d61: am
23d0b528: Update string in Settings
* commit '
dd6c0d61d7a3c605be2d402c3cd2586c539df81c':
Update string in Settings
Jason Chen [Fri, 16 Mar 2012 21:16:17 +0000 (14:16 -0700)]
am
23d0b528: Update string in Settings
* commit '
23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
Update string in Settings
Jason Chen [Fri, 16 Mar 2012 18:29:01 +0000 (11:29 -0700)]
Update string in Settings
Bug:
6183254
Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
Irfan Sheriff [Fri, 2 Mar 2012 06:55:17 +0000 (22:55 -0800)]
am
c4bf8cd9: am
2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit '
c4bf8cd955e7a317c6d9c0eb023d5994be0f1e9d':
Enable EAP-pwd configuration in WiFi Settings.
Irfan Sheriff [Fri, 2 Mar 2012 06:48:42 +0000 (22:48 -0800)]
am
2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit '
2f76aaaf0105add942334ef3574e7378ee8a6097':
Enable EAP-pwd configuration in WiFi Settings.
Irfan Sheriff [Fri, 2 Mar 2012 00:47:19 +0000 (16:47 -0800)]
Merge "Enable EAP-pwd configuration in WiFi Settings."
The Android Open Source Project [Thu, 1 Mar 2012 18:43:48 +0000 (10:43 -0800)]
am
b2a0ea35: Reconcile with ics-mr1-release
* commit '
b2a0ea3541191318a8810cef63a2d2b7d9566e4e':
The Android Open Source Project [Thu, 1 Mar 2012 18:40:59 +0000 (10:40 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie559363abe963201d622a17caae6827d8a22e44e
The Android Open Source Project [Thu, 1 Mar 2012 18:14:25 +0000 (10:14 -0800)]
am
79ec613a: Reconcile with ics-mr1-release
* commit '
79ec613a66b71a16591bcd3bde5cb815f1a3d352':
The Android Open Source Project [Thu, 1 Mar 2012 18:12:39 +0000 (10:12 -0800)]
Reconcile with ics-mr1-release
Change-Id: Icb875d44d67d0d2c6befa309453a464668289ccd
The Android Automerger [Tue, 28 Feb 2012 23:15:44 +0000 (15:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Amith Yamasani [Tue, 28 Feb 2012 18:16:55 +0000 (10:16 -0800)]
am
9220d367: am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
9220d367eb30ba8f5375627cd782921b82c8b332':
Amith Yamasani [Tue, 28 Feb 2012 18:15:11 +0000 (10:15 -0800)]
am
e5cb62f5: am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
e5cb62f5f4af389f21d950b7847f0df909a0225f':
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Amith Yamasani [Tue, 28 Feb 2012 18:14:00 +0000 (10:14 -0800)]
am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
9372484065993cfdb9a48ddecc52d2ed911e8ce1':
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Amith Yamasani [Tue, 28 Feb 2012 18:13:28 +0000 (10:13 -0800)]
am
93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '
9372484065993cfdb9a48ddecc52d2ed911e8ce1':
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Amith Yamasani [Tue, 28 Feb 2012 01:09:37 +0000 (17:09 -0800)]
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Bug:
6079494
(cherry picked from commit
5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8)
Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
Partha N [Wed, 18 Jan 2012 02:33:03 +0000 (18:33 -0800)]
Enable EAP-pwd configuration in WiFi Settings.
EAP-pwd (RFC 5931) is an EAP method that uses a shared password
for authentication. It has the simplicity of setup as WPA2-PSK
(no certificates), but provides strong authenticaiton like 802.1x.
Modified the Settings screen so that the only visible fields
when choosing EAP-pwd are 'identity' and 'password'.
Change-Id: I9365d873b43c416ddfa4cae47b7419d902c212a7
Signed-off-by: Partha N <parthan@gmail.com>
The Android Open Source Project [Thu, 16 Feb 2012 18:13:50 +0000 (10:13 -0800)]
am
cff569f1: Reconcile with ics-mr1-release
* commit '
cff569f11cb4960ce5299bf6c198eeb7945dc224':
The Android Open Source Project [Thu, 16 Feb 2012 18:11:02 +0000 (10:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie299bdc69639bde826652cf5da7b7826161b787e
The Android Open Source Project [Thu, 16 Feb 2012 18:06:42 +0000 (10:06 -0800)]
am
7b276302: Reconcile with ics-mr1-release
* commit '
7b2763021750a2d138eaa20ee2d2828d83d1720c':
The Android Open Source Project [Thu, 16 Feb 2012 18:03:02 +0000 (10:03 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ibe6997bc5295b3deb615e8f51f73a1639d0f3235
The Android Automerger [Tue, 14 Feb 2012 22:17:08 +0000 (14:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Fri, 10 Feb 2012 18:49:56 +0000 (10:49 -0800)]
am
8b24b374: am
78ef5443: Import translations. DO NOT MERGE
* commit '
8b24b374139e608182515b56ec6f7b87a8293024':
Eric Fischer [Fri, 10 Feb 2012 18:16:08 +0000 (10:16 -0800)]
am
ecd9c570: (-s ours) am
78ef5443: Import translations. DO NOT MERGE
* commit '
ecd9c570f767040e8c021aa6ed995894c0d8d754':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:13:38 +0000 (10:13 -0800)]
am
78ef5443: Import translations. DO NOT MERGE
* commit '
78ef5443a66ee01d75d89227bfd078706184662c':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 10 Feb 2012 18:12:35 +0000 (10:12 -0800)]
am
78ef5443: Import translations. DO NOT MERGE
* commit '
78ef5443a66ee01d75d89227bfd078706184662c':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 03:08:43 +0000 (19:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
Eric Fischer [Mon, 6 Feb 2012 20:50:21 +0000 (12:50 -0800)]
am
4bec429d: Import translations. DO NOT MERGE
* commit '
4bec429dd5a6f22b3a23aff8ed29b7a68786bba5':
Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:43:39 +0000 (12:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I615776e4f0521a14747ecf6f9e7f8a695bc128b9
Eric Fischer [Fri, 3 Feb 2012 21:54:46 +0000 (13:54 -0800)]
am
117bfe86: Import translations. DO NOT MERGE
* commit '
117bfe86cd1b71b35bef4069a2bbd8452cd37a43':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 20:46:38 +0000 (12:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic23ab755fb8351dfd34f1da3943b1cd8b475e923
Eric Fischer [Thu, 2 Feb 2012 22:07:34 +0000 (14:07 -0800)]
resolved conflicts for merge of
cbbfffca to ics-scoop-plus-aosp
Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc
Eric Fischer [Thu, 2 Feb 2012 22:00:17 +0000 (14:00 -0800)]
resolved conflicts for merge of
67a50f99 to ics-scoop
Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa
Eric Fischer [Thu, 2 Feb 2012 21:49:08 +0000 (13:49 -0800)]
am
940f2a74: (-s ours) am
67a50f99: Import translations. DO NOT MERGE
* commit '
940f2a7479eb68af290f631d227bc79dcf29a7c5':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 21:47:17 +0000 (13:47 -0800)]
am
67a50f99: Import translations. DO NOT MERGE
* commit '
67a50f99d80b76337541fb71f98025c0b144e5b5':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 21:26:26 +0000 (13:26 -0800)]
am
cd92dd07: Import translations. DO NOT MERGE
* commit '
cd92dd07546a7fe410e3d0184cfafa3561b72050':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 20:54:58 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1e698fedf0d3e3f8ef30cca119303dbb4ca3f402
Eric Fischer [Thu, 2 Feb 2012 20:54:15 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a
The Android Open Source Project [Wed, 1 Feb 2012 18:01:15 +0000 (10:01 -0800)]
am
e3e777f7: Reconcile with ics-mr1-release
* commit '
e3e777f7f208e6b88816225b5a1d33cfc59a2221':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:41 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I298ee044e83510a9caa19f51e94567863861a8a0
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:58:03 +0000 (13:58 -0800)]
am
b6e57c1f: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"
* commit '
b6e57c1f598fd9bf0f15c1e9eed238910e9fca1f':
Do not set minimum value for mobile data limit dialog higher than the actual set value
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:26:25 +0000 (13:26 -0800)]
Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"
Shuhrat Dehkanov [Thu, 26 Jan 2012 14:04:02 +0000 (23:04 +0900)]
Do not set minimum value for mobile data limit dialog higher than the actual set value
When mobile data limit and warning limit are set to 0, pressing mobile data limit text
(0.0 GB) pops up mobile data limit dialog with minimum value 1. But the value set is 0,
which is causing the dialog to show its maximum value 2^31-1.
Change-Id: I79ed4df5fbf095a7e60bda640ff2ca26bcbd3cc4
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
The Android Open Source Project [Mon, 23 Jan 2012 18:16:07 +0000 (10:16 -0800)]
Reconcile with ics-mr1-release
Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059
The Android Automerger [Sat, 21 Jan 2012 00:13:29 +0000 (16:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:42:33 +0000 (14:42 -0800)]
am
43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
* commit '
43c9dcc18e4e1137c59b847eadde7ae27302b08f':
Fix a pseudo race condition in TtsEngineSettingsFragment.
Narayan Kamath [Fri, 20 Jan 2012 22:42:33 +0000 (14:42 -0800)]
am
999f23e2: Locale string comparisons must ignore case.
* commit '
999f23e2c304bde3a5c27f7f882d4616f5abdf9e':
Locale string comparisons must ignore case.
Justin Ho [Fri, 20 Jan 2012 22:40:04 +0000 (14:40 -0800)]
Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
Narayan Kamath [Fri, 20 Jan 2012 17:52:02 +0000 (17:52 +0000)]
Fix a pseudo race condition in TtsEngineSettingsFragment.
The issue is that Fragment.setVoiceDataDetails can
be called before Fragment.getView. We guard against this
issue. No thread visibility issues here because both functions
are called on the UI thread.
bug:
5884355
Change-Id: Iad91b91c58b04dcb9f34f6b5ff8752f2e8295423
Narayan Kamath [Fri, 20 Jan 2012 17:31:03 +0000 (17:31 +0000)]
Locale string comparisons must ignore case.
The spec does not specify case sensitivity and support
for 3 letter locales is currently poor.
bug:
5885830
Change-Id: I1b8f582bd19b1b0aed220036c5f17904478dba46
Jean-Baptiste Queru [Thu, 12 Jan 2012 19:03:02 +0000 (11:03 -0800)]
am
02bc3ffe: am
1e78bd01: Merge "Observer for GPS is never added back."
* commit '
02bc3ffe311f8cc5f9e9464ed0ecdd73ea576020':
Observer for GPS is never added back.
Jean-Baptiste Queru [Thu, 12 Jan 2012 19:00:21 +0000 (11:00 -0800)]
am
1e78bd01: Merge "Observer for GPS is never added back."
* commit '
1e78bd01ca308eec6a08ad376a889240635d6c24':
Observer for GPS is never added back.
Jean-Baptiste Queru [Thu, 12 Jan 2012 17:12:59 +0000 (09:12 -0800)]
Merge "Observer for GPS is never added back."
The Android Open Source Project [Thu, 12 Jan 2012 16:56:52 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4907309d47ab642baf4a2ca0c65b563400f52ee9
The Android Automerger [Thu, 12 Jan 2012 00:29:50 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jim Miller [Tue, 10 Jan 2012 18:30:39 +0000 (10:30 -0800)]
am
af487099: Merge "Fix
4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit '
af48709993faeb0d3665eb6a491aaec701e1ccd5':
Fix
4560303: Add setting to lock later when power button pressed
Jim Miller [Tue, 10 Jan 2012 18:28:31 +0000 (10:28 -0800)]
Merge "Fix
4560303: Add setting to lock later when power button pressed" into ics-mr1
Amith Yamasani [Tue, 10 Jan 2012 00:03:30 +0000 (16:03 -0800)]
am
aaff44c8: Don\'t allow wifi tethering when running monkeys.
* commit '
aaff44c84f4e88184276064dff9e36eefde3ffcb':
Don't allow wifi tethering when running monkeys.
Amith Yamasani [Mon, 9 Jan 2012 22:52:58 +0000 (14:52 -0800)]
Don't allow wifi tethering when running monkeys.
Bug:
5607825
Remove the wifi access point settings and wifi tethering checkbox when
monkeys are running.
Change-Id: I64b930ddb791013a08c178561fe29130f1f0e4b8
Jim Miller [Sat, 7 Jan 2012 02:28:09 +0000 (18:28 -0800)]
Fix
4560303: Add setting to lock later when power button pressed
This adds a feature to delay locking the device when the power button
is pressed. This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.
Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63
The Android Open Source Project [Sat, 7 Jan 2012 02:15:48 +0000 (18:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ifa3965b3e29cc1a9fe89a24e78e83507a4b2880c
The Android Automerger [Sat, 7 Jan 2012 00:32:49 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Todd Poynor [Thu, 5 Jan 2012 19:23:34 +0000 (11:23 -0800)]
am
da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1
* commit '
da68fd4620088c1cb3a51cd2064885cbcd1ac621':
Android OS battery usage overstated by screen on time
Todd Poynor [Thu, 5 Jan 2012 19:21:08 +0000 (11:21 -0800)]
Merge "Android OS battery usage overstated by screen on time" into ics-mr1
Todd Poynor [Sat, 17 Dec 2011 00:02:51 +0000 (16:02 -0800)]
Android OS battery usage overstated by screen on time
Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Vladimir Baryshnikov [Wed, 4 Jan 2012 02:11:42 +0000 (18:11 -0800)]
Observer for GPS is never added back.
mSettingsObserver will be added only once to mContentQueryMap on first start,
but if you bring activity back to top, it will not be added any more.
Signed-off-by: Vladimir Baryshnikov <vovkab@gmail.com>
The Android Open Source Project [Wed, 21 Dec 2011 15:19:46 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49
The Android Automerger [Wed, 21 Dec 2011 01:27:42 +0000 (17:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Kazuhiro Ondo [Wed, 21 Dec 2011 00:45:45 +0000 (16:45 -0800)]
am
a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available
* commit '
a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78':
Don't enable SIM PIN Lock menu if SIM is not available
Kazuhiro Ondo [Fri, 16 Dec 2011 21:34:13 +0000 (15:34 -0600)]
Don't enable SIM PIN Lock menu if SIM is not available
Bug:
5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7
The Android Open Source Project [Wed, 14 Dec 2011 03:10:39 +0000 (19:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4d2578e9635a5585c499f7ffcd816c5cf6876b3f
The Android Automerger [Wed, 14 Dec 2011 00:04:02 +0000 (16:04 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Tue, 13 Dec 2011 18:18:52 +0000 (10:18 -0800)]
am
2bccd7f4: Import revised translations. DO NOT MERGE
* commit '
2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Dec 2011 18:04:17 +0000 (10:04 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
The Android Open Source Project [Tue, 13 Dec 2011 13:12:02 +0000 (05:12 -0800)]
Reconcile with ics-mr1-release
Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60
The Android Automerger [Tue, 13 Dec 2011 06:09:28 +0000 (22:09 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Mon, 12 Dec 2011 19:06:39 +0000 (11:06 -0800)]
am
080691ed: Import revised translations. DO NOT MERGE
* commit '
080691eda9be32e090ed9abba1cc6fa0047b51fd':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 12 Dec 2011 19:00:08 +0000 (11:00 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
The Android Open Source Project [Fri, 9 Dec 2011 15:11:40 +0000 (07:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iaa494a9536a8a244bcb4050d78e7dc15dc8460f0
The Android Automerger [Fri, 9 Dec 2011 01:36:03 +0000 (17:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Meng Hu [Thu, 8 Dec 2011 22:18:03 +0000 (14:18 -0800)]
am
3feacdf3: Add Sprint update menu
* commit '
3feacdf3969800d6c53c6ca6f8ced2f8fc637f7f':
Add Sprint update menu
Meng Hu [Sun, 27 Nov 2011 05:06:40 +0000 (23:06 -0600)]
Add Sprint update menu
Adds the conditionally used xml ui definition and removes it at runtime when it's not
wanted. Ported from GB.
bug:
5237167
Change-Id: I89a67e1033ddc7099563732e839c08fbadb4fd75
Eric Fischer [Thu, 8 Dec 2011 19:13:18 +0000 (11:13 -0800)]
am
d59d7cb0: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
d59d7cb0914ff4fb8e0a6cf6f33c2fd2a27b6559':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Dec 2011 19:09:58 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 18:36:13 +0000 (10:36 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If9d9c2cd72682251e2743543c8f6ee36b2c2da2a
The Android Open Source Project [Thu, 8 Dec 2011 18:29:03 +0000 (10:29 -0800)]
am
a961c06b: Reconcile with ics-mr0-release
* commit '
a961c06b9c0718406a72d71125aa0bf45d3c8659':
The Android Open Source Project [Thu, 8 Dec 2011 18:26:01 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release
Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc
The Android Open Source Project [Thu, 8 Dec 2011 18:22:18 +0000 (10:22 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I410c510ccb55648d119fe4638cecbe87f25df94b
The Android Automerger [Thu, 8 Dec 2011 15:01:43 +0000 (07:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings
Bug:
5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
Chia-chi Yeh [Wed, 7 Dec 2011 20:26:52 +0000 (12:26 -0800)]
Merge "VpnSettings: add support for server certificates." into ics-mr1
Irfan Sheriff [Wed, 7 Dec 2011 20:20:27 +0000 (12:20 -0800)]
am
fec195d7: Fix NPE in advanced settings
* commit '
fec195d7564b489fcdd814d066cfbf6af702132b':
Fix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings
Bug:
5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings
Bug:
5723974
Change-Id: I9904b6adb2b51f1511f932ef7cba8f6558417061
The Android Open Source Project [Wed, 7 Dec 2011 15:25:12 +0000 (07:25 -0800)]
Reconcile with ics-mr0-release
Change-Id: I6c179ffa896fe24988d4e43c9bce91d7499d2010
Chia-chi Yeh [Wed, 7 Dec 2011 01:51:01 +0000 (17:51 -0800)]
VpnSettings: add support for server certificates.
Bug:
5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a
The Android Automerger [Wed, 7 Dec 2011 00:54:59 +0000 (16:54 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Irfan Sheriff [Tue, 6 Dec 2011 19:21:49 +0000 (11:21 -0800)]
Remove watchdog setting for poor network avoidance
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
Irfan Sheriff [Tue, 6 Dec 2011 19:37:04 +0000 (11:37 -0800)]
am
d03c1511: Remove watchdog setting for poor network avoidance
* commit '
d03c15119d404d282ccc5fba257a6ca76962769c':
Remove watchdog setting for poor network avoidance
Irfan Sheriff [Tue, 6 Dec 2011 19:21:49 +0000 (11:21 -0800)]
Remove watchdog setting for poor network avoidance
Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2
OSDN Git Service
