OSDN Git Service
Eric Fischer [Thu, 16 Jun 2011 22:48:43 +0000 (15:48 -0700)]
am
5bdc3e91: Import revised Croatian translations.
* commit '
5bdc3e9139a7b37b97a56554cc9a89abc196b437':
Import revised Croatian translations.
Eric Fischer [Wed, 15 Jun 2011 19:09:02 +0000 (12:09 -0700)]
Import revised Croatian translations.
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
Jaikumar Ganesh [Fri, 27 May 2011 20:47:08 +0000 (13:47 -0700)]
am
015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '
015788ca9228312dfca30785b1801f33a3a32e9a':
Import translations for cherry-picked Bluetooth changes.
Jaikumar Ganesh [Fri, 27 May 2011 20:47:01 +0000 (13:47 -0700)]
am
eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit '
eddb21a2ebd39900893da63749a00570f37e5038':
Changes for API of Bluetooth Discoverability. DO NOT MERGE
Jaikumar Ganesh [Fri, 27 May 2011 20:46:59 +0000 (13:46 -0700)]
am
c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit '
c955d8ee1d2b134f8c41989b545b7b3ed830d058':
Allow users to change the length of BT disoverability. DO NOT MERGE
Jaikumar Ganesh [Fri, 27 May 2011 20:28:57 +0000 (13:28 -0700)]
Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
Jaikumar Ganesh [Fri, 27 May 2011 20:28:49 +0000 (13:28 -0700)]
Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
Jaikumar Ganesh [Fri, 27 May 2011 20:28:41 +0000 (13:28 -0700)]
Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 27 May 2011 19:45:28 +0000 (12:45 -0700)]
Import translations for cherry-picked Bluetooth changes.
Change-Id: I03caaf58d9fd357801c05ae99b6131df992e7bdf
Jaikumar Ganesh [Wed, 2 Feb 2011 03:58:29 +0000 (19:58 -0800)]
Changes for API of Bluetooth Discoverability. DO NOT MERGE
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the default - 120 secs.
A dialog is shown by the system to the users to accept the change
in discoverability values.
Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
Chris Wren [Tue, 1 Feb 2011 23:09:13 +0000 (15:09 -0800)]
Allow users to change the length of BT disoverability. DO NOT MERGE
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug
2413429:
http://b/issue?id=
2413429
and external issue 6348:
http://code.google.com/p/android/issues/detail?id=6348
Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>
Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
sy310.choi [Thu, 26 May 2011 20:47:20 +0000 (13:47 -0700)]
am
95364e4a: Allow alternate string to be used for min_number
* commit '
95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
Allow alternate string to be used for min_number
sy310.choi [Tue, 24 May 2011 05:19:16 +0000 (14:19 +0900)]
Allow alternate string to be used for min_number
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.
Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
Eric Fischer [Wed, 27 Apr 2011 22:31:22 +0000 (15:31 -0700)]
am
7c284c2c: Import revised translations. DO NOT MERGE
* commit '
7c284c2c62ce565dacfae641108a2a5033e78721':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 27 Apr 2011 20:53:57 +0000 (13:53 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I56239c7b2a936acc9b93b8592a2a04e42a55458b
Conley Owens [Wed, 27 Apr 2011 16:55:23 +0000 (09:55 -0700)]
am
bc20d67f: Merge "Avoid crash when switching to 2G/3G network."
* commit '
bc20d67fedd453eec9dcb127cf9df909a192baf5':
Avoid crash when switching to 2G/3G network.
Conley Owens [Wed, 27 Apr 2011 16:51:22 +0000 (09:51 -0700)]
Merge "Avoid crash when switching to 2G/3G network."
Kenneth Westin [Tue, 26 Apr 2011 12:08:45 +0000 (14:08 +0200)]
Avoid crash when switching to 2G/3G network.
Adding test that active APN array is not empty.
Change-Id: I16246aa45c991a9396ef03d9bb083d97c3ca2e1a
Simon Wilson [Mon, 11 Apr 2011 21:12:43 +0000 (14:12 -0700)]
am
37063d6a: DO NOT MERGE Clarify additional system update string length/usage
* commit '
37063d6adf9b472a8bb4bd58493517e04aafba95':
DO NOT MERGE Clarify additional system update string length/usage
Simon Wilson [Mon, 11 Apr 2011 19:38:21 +0000 (12:38 -0700)]
DO NOT MERGE Clarify additional system update string length/usage
Change-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49
Eric Fischer [Mon, 4 Apr 2011 21:43:04 +0000 (14:43 -0700)]
am
fcb089c9: Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
* commit '
fcb089c94280dd3b5a1ed8f90610d258a43abb78':
Reimport Settings translations. DO NOT MERGE
Simon Wilson [Mon, 4 Apr 2011 21:43:02 +0000 (14:43 -0700)]
am
ca572fb6: Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
* commit '
ca572fb64b77a2fe3ff93874ee5956214368b104':
DO NOT MERGE Put additional update package names in config.xml
Eric Fischer [Mon, 4 Apr 2011 21:42:59 +0000 (14:42 -0700)]
am
b4bd78f5: Revert "Import revised translations. DO NOT MERGE"
* commit '
b4bd78f52305aa1b47fe9ac09d99e00116f201a6':
Revert "Import revised translations. DO NOT MERGE"
Eric Fischer [Mon, 4 Apr 2011 19:21:25 +0000 (12:21 -0700)]
am
955ab98f: Import revised translations. DO NOT MERGE
* commit '
955ab98f030cd198d838bdff8768ff87a17be9a8':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 1 Apr 2011 23:52:28 +0000 (16:52 -0700)]
Merge "Reimport Settings translations. DO NOT MERGE" into gingerbread
Simon Wilson [Fri, 1 Apr 2011 23:47:22 +0000 (16:47 -0700)]
Merge "DO NOT MERGE Put additional update package names in config.xml" into gingerbread
Eric Fischer [Fri, 1 Apr 2011 23:42:38 +0000 (16:42 -0700)]
Reimport Settings translations. DO NOT MERGE
Change-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a
Eric Fischer [Fri, 1 Apr 2011 23:12:35 +0000 (16:12 -0700)]
Revert "Import revised translations. DO NOT MERGE"
This reverts commit
955ab98f030cd198d838bdff8768ff87a17be9a8.
Bug
4204088 requires that these strings not be translated.
Change-Id: I98044cc669a9ee70a8892123a05c0fc33599d404
Simon Wilson [Fri, 1 Apr 2011 20:41:03 +0000 (13:41 -0700)]
DO NOT MERGE Put additional update package names in config.xml
Prevents them from being duplicated to other language resources,
which in turn prevents the overlay from working. This fixes the
bug where we see a blank menu item in Settings->About phone
when the non-default language is selected.
Change-Id: I73056716156c580606433bb63abfdd35c1b9892a
Park Sanghyun [Wed, 30 Mar 2011 16:31:15 +0000 (09:31 -0700)]
am
e5da8565: DO NOT MERGE Add support for additional System Update menu item
* commit '
e5da8565ca7930483c2e8c6467710716cf51ba51':
DO NOT MERGE Add support for additional System Update menu item
Kenny Root [Tue, 29 Mar 2011 22:43:38 +0000 (15:43 -0700)]
am
7fceefa7: Merge "Settings: Improved UX when viewing open source license info."
* commit '
7fceefa79229ece2efab0446841543a8f8f20a1d':
Settings: Improved UX when viewing open source license info.
Kenny Root [Tue, 29 Mar 2011 22:03:25 +0000 (15:03 -0700)]
Merge "Settings: Improved UX when viewing open source license info."
Henrik Carlsson [Fri, 3 Sep 2010 09:08:19 +0000 (11:08 +0200)]
Settings: Improved UX when viewing open source license info.
Added spinning progress indicator to the open source license dialog.
The actual file loading is now handled by a separate thread, in
order to provide user feedback and reduce risk for ANR.
Change-Id: Ia12727ecc2fe8114e0d1384769b568142c8a1db6
Eric Fischer [Tue, 29 Mar 2011 17:58:24 +0000 (10:58 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic2e2fd3330cb069f55054e08aad153c1b342e0a4
Park Sanghyun [Fri, 25 Mar 2011 07:23:59 +0000 (16:23 +0900)]
DO NOT MERGE Add support for additional System Update menu item
Change-Id: I21bf87b5d2805da672c0617a098258e0e2b78915
Eric Fischer [Fri, 18 Mar 2011 23:52:30 +0000 (16:52 -0700)]
am
c4eeeb29: Import revised translations. DO NOT MERGE
* commit '
c4eeeb29c5c72d9ceb16c373c4d3902c155a0f26':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 18 Mar 2011 22:17:01 +0000 (15:17 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I512bfadfc427f0676bce9e79c20babe006324ca1
TK MUN [Thu, 17 Mar 2011 23:20:42 +0000 (16:20 -0700)]
am
e0e845fe: DO NOT MERGE Do not allow shortcut for "4G Settings"
* commit '
e0e845fee6703a1a2ed75c4fe67cb0202dd076c0':
DO NOT MERGE Do not allow shortcut for "4G Settings"
TK MUN [Wed, 16 Mar 2011 07:04:54 +0000 (16:04 +0900)]
DO NOT MERGE Do not allow shortcut for "4G Settings"
Settings shortcuts are only for the modules inside the settings
application. The pathclassloader is /system/app/Settings.apk for
all the settings shortcuts. Since 4G settings is outside of
Settings.apk, we cannot support a shortcut for this.
Change-Id: I1b5523618ef5e8eea8535793f3a983e6ba21d551
Mike Lockwood [Mon, 14 Mar 2011 20:34:57 +0000 (13:34 -0700)]
am
e6c7e45f: DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
* commit '
e6c7e45fdb5f23462693ea76eeac9489dd5c8dac':
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Mike Lockwood [Wed, 9 Mar 2011 17:10:41 +0000 (12:10 -0500)]
DO NOT MERGE: IUsbManager hasDefaults() and clearDefaults() no longer take UID parameter
Bug:
4061035
Change-Id: Idfec53b1da7b9b981c1c762468a3f69f78fedd7a
Signed-off-by: Mike Lockwood <lockwood@android.com>
TK MUN [Thu, 10 Mar 2011 07:11:59 +0000 (23:11 -0800)]
am
36469186: DO NOT MERGE WiMAX settings menu
* commit '
36469186b7459d13688a2ca1c2316dbf172794dd':
DO NOT MERGE WiMAX settings menu
TK MUN [Wed, 23 Feb 2011 09:57:38 +0000 (18:57 +0900)]
DO NOT MERGE WiMAX settings menu
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.
Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099
Signed-off-by: TK MUN <tk.mun@samsung.com>
Lorenzo Colitti [Fri, 4 Mar 2011 01:07:39 +0000 (17:07 -0800)]
am
f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread
* commit '
f4393101f80f0ca1a10771613a18565323b69fa2':
Support configuring the protocol in APN settings.
Lorenzo Colitti [Fri, 4 Mar 2011 01:03:45 +0000 (17:03 -0800)]
Merge "Support configuring the protocol in APN settings." into gingerbread
Mike Lockwood [Wed, 2 Mar 2011 23:38:51 +0000 (15:38 -0800)]
am
0552d336: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
* commit '
0552d3366487b27c619c055a04c81b8af0b84d33':
DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
Mike Lockwood [Sun, 27 Feb 2011 17:05:10 +0000 (09:05 -0800)]
DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
The USB service caches the preferred activity preferences for USB devices
and accessories and allows permission to access the hardware based on the
user's selection. The "Clear defaults" button can now be used to clear
these settings.
Change-Id: If865df98214506cf2f1e35c8c6a3dbe319b125f2
Signed-off-by: Mike Lockwood <lockwood@android.com>
Lorenzo Colitti [Wed, 29 Dec 2010 23:52:41 +0000 (15:52 -0800)]
Support configuring the protocol in APN settings.
Bug:
3333633
Change-Id: I0797cd97074fe1b8a1318168b86fe4627488215a
Eric Fischer [Fri, 18 Feb 2011 23:22:41 +0000 (15:22 -0800)]
am
bd044818: Import revised translations. DO NOT MERGE
* commit '
bd0448185f32d52e3561e1b10e00e16ec5b4a7cd':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 15 Feb 2011 01:25:07 +0000 (17:25 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I8e7d2652c85f2bd516881e11283af62ee760adb1
Amith Yamasani [Fri, 11 Feb 2011 19:03:56 +0000 (11:03 -0800)]
am
aae04e43: Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
* commit '
aae04e43ec277c095e181933976dfa7bfd044288':
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Amith Yamasani [Fri, 11 Feb 2011 01:19:11 +0000 (17:19 -0800)]
Prevent monkeys from USB tethering. It disconnects the test host. DO NOT MERGE.
Bug:
3443747
Change-Id: Ied9c842e306e299fec7cd201415e0cfad0d29630
Eric Fischer [Wed, 9 Feb 2011 01:33:14 +0000 (17:33 -0800)]
am
47d2ecd0: Import revised translations. DO NOT MERGE
* commit '
47d2ecd0c4faf758f59f4eb59f515a41091c39e0':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Feb 2011 21:38:01 +0000 (13:38 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: If53b83d77929ba02915eeafd3c614599316cca1e
Jake Hamby [Sat, 5 Feb 2011 00:20:15 +0000 (16:20 -0800)]
am
1798fc04: Merge "Fixed a memory leak in the bluetooth settings"
* commit '
1798fc049eda5f6fd14be3a369eebe81c851abd2':
Fixed a memory leak in the bluetooth settings
Jake Hamby [Sat, 5 Feb 2011 00:12:54 +0000 (16:12 -0800)]
Merge "Fixed a memory leak in the bluetooth settings"
Eric Fischer [Tue, 1 Feb 2011 00:15:26 +0000 (16:15 -0800)]
am
93580e22: Import revised translations. DO NOT MERGE
* commit '
93580e222c156e06b348d228bec24d83836af1f2':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 31 Jan 2011 20:25:49 +0000 (12:25 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I7189d018da1a65d6e37b16353b1133b6a51d0df1
Eric Fischer [Fri, 28 Jan 2011 22:16:07 +0000 (14:16 -0800)]
am
5a2bb8c0: Import revised translations. DO NOT MERGE
* commit '
5a2bb8c0dc33837696f80d6690d51f031d7884c8':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 28 Jan 2011 21:21:54 +0000 (13:21 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
Eric Fischer [Thu, 27 Jan 2011 23:03:43 +0000 (15:03 -0800)]
am
95112e5b: Import revised translations. DO NOT MERGE
* commit '
95112e5b9810b6a70974ace6ee1c017b57e466af':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Jan 2011 22:04:11 +0000 (14:04 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I64435ed3b620c5e748b0f15017d548eadf7adbd5
Amith Yamasani [Tue, 18 Jan 2011 17:08:41 +0000 (09:08 -0800)]
am
f7fd4ca8: Merge "Disable change PIN when PIN is inactive"
* commit '
f7fd4ca832e8ee28f0217d8096c3b401309a1f0f':
Disable change PIN when PIN is inactive
Amith Yamasani [Tue, 18 Jan 2011 16:52:40 +0000 (08:52 -0800)]
Merge "Disable change PIN when PIN is inactive"
Eric Fischer [Fri, 7 Jan 2011 04:30:09 +0000 (20:30 -0800)]
am
6418d373: Import translations for additional languages.
* commit '
6418d373679ef0b73701bacc1de34f68f1c9ade8':
Import translations for additional languages.
Eric Fischer [Thu, 6 Jan 2011 18:39:31 +0000 (10:39 -0800)]
Import translations for additional languages.
Change-Id: Ic94b9ae9229478ad7d0a49d3af9a954b50c8fdf5
Gustaf Nilklint [Tue, 4 Jan 2011 06:56:45 +0000 (07:56 +0100)]
Fixed a memory leak in the bluetooth settings
Release resources in onPause rather than onResume to fix a memory leak.
Without this fix the app will crash if you are in Bluetooth settings
and tap "Device name" and then roate the device a few times.
Change-Id: I57a8346247c13f5113e7c4ea39dde5b29a7359bb
Jean-Baptiste Queru [Tue, 28 Dec 2010 20:02:44 +0000 (12:02 -0800)]
am
e8531ff6: Merge "Changed the text input type of APN name to plain text"
* commit '
e8531ff6a03a0542b7b1531ddd469befed9bab85':
Changed the text input type of APN name to plain text
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:52:15 +0000 (11:52 -0800)]
Merge "Changed the text input type of APN name to plain text"
Nick Pelly [Sat, 11 Dec 2010 01:22:30 +0000 (17:22 -0800)]
am
c1286804: Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
* commit '
c1286804cc839ec7006d6e9651c73ec7b3180157':
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Nick Pelly [Sat, 11 Dec 2010 01:18:54 +0000 (17:18 -0800)]
Merge "Update Settings for new NfcAdapter.getDefaultAdapter(Context)" into gingerbread
Eric Fischer [Fri, 10 Dec 2010 18:03:51 +0000 (10:03 -0800)]
am
99d2471d: Import revised translations. DO NOT MERGE
* commit '
99d2471d8d6c2a8cc0eb8e4540ba9090d46693d8':
Import revised translations. DO NOT MERGE
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:49:47 +0000 (08:49 -0800)]
am
2a7c5425: reconcile with open-source gingerbread
* commit '
2a7c542594e37f61e25fec7f441eb0a8dc14fd62':
Nick Pelly [Fri, 10 Dec 2010 03:39:58 +0000 (19:39 -0800)]
Update Settings for new NfcAdapter.getDefaultAdapter(Context)
Change-Id: I3321d9ebd90313f98664d66b53bb36690808911a
Eric Fischer [Fri, 10 Dec 2010 00:57:40 +0000 (16:57 -0800)]
Import revised translations. DO NOT MERGE
Bug
3272618
Change-Id: Id1c49e216342247bf8574db0bf2a53f8e15bdc6e
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:45:31 +0000 (10:45 -0800)]
am
1acfef82: merge from gingerbread
* commit '
1acfef82bd464fdbd3765321a051e59728b4d72b':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jean-Baptiste Queru [Thu, 9 Dec 2010 18:18:44 +0000 (10:18 -0800)]
reconcile with open-source gingerbread
Change-Id: I2c27148958dbc2c47121d4874e1108389da804c0
Jean-Baptiste Queru [Thu, 9 Dec 2010 17:11:15 +0000 (09:11 -0800)]
merge from gingerbread
Change-Id: Icee740e130b9ebd21446de79b63435f5d1d046e4
Jake Hamby [Sat, 4 Dec 2010 01:02:02 +0000 (17:02 -0800)]
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.
Bug:
3246147
Change-Id: I2f46303cf44951f0b3907c43d4b096736f08765b
Gustaf Nilklint [Mon, 6 Dec 2010 09:21:13 +0000 (10:21 +0100)]
Disable change PIN when PIN is inactive
Disabled the option to change PIN code when PIN lock is disabled.
This is done by adding dependency to the checkbox above in the XML file.
Change-Id: Idafae0820297b8f7ba7a14f5ebe4f7e691547cc8
Jake Hamby [Sun, 5 Dec 2010 07:45:23 +0000 (23:45 -0800)]
am
b0fda6f5: Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
* commit '
b0fda6f56a0ee3c42cf02813b5fc346382873c4f':
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
Jake Hamby [Sat, 4 Dec 2010 01:02:02 +0000 (17:02 -0800)]
Reduce max BT device length to 246 bytes due to Bluez bug. (DO NOT MERGE)
The maximum Bluetooth device name length is 248 bytes. There are bugs in
Bluez and D-Bus that can cause the Bluetooth service to go into a reboot
loop when the device name is set to the maximum length. Changed Settings
app to limit the device name length to 246 bytes.
Bug:
3246147
Change-Id: I320fc7a9a0bfdf8067387ec8de80efccaca2b5f6
Irfan Sheriff [Wed, 1 Dec 2010 23:53:32 +0000 (15:53 -0800)]
am
fa04d89f: avoid view creation on orientation change
* commit '
fa04d89fd8dd8674375de7a10ca755056b88b811':
avoid view creation on orientation change
Irfan Sheriff [Wed, 1 Dec 2010 23:05:44 +0000 (15:05 -0800)]
avoid view creation on orientation change
Bug:
3238075
Change-Id: Ia245e701b9663a1a8eb0457b8a181a7899e8d6c5
Eric Fischer [Tue, 30 Nov 2010 19:48:26 +0000 (11:48 -0800)]
am
e1e257f4: Import revised translations. DO NOT MERGE
* commit '
e1e257f4b45fcd5dd59b73295804df94eefc4970':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 30 Nov 2010 00:21:55 +0000 (16:21 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I74acfc5708208509b1afe3ad55ba8a4777c7b34f
Jean-Baptiste Queru [Tue, 30 Nov 2010 00:11:16 +0000 (16:11 -0800)]
am
04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch"
* commit '
04b646df1e9f00719d2d547fa1da59407bb6be67':
Possible NumberFormatException of parseInt is outside try-catch
Jean-Baptiste Queru [Tue, 30 Nov 2010 00:07:44 +0000 (16:07 -0800)]
Merge "Possible NumberFormatException of parseInt is outside try-catch"
Peter Kuterna [Sun, 28 Nov 2010 21:35:31 +0000 (22:35 +0100)]
Possible NumberFormatException of parseInt is outside try-catch
Change-Id: I77c1e41185a8d3a1724af848d6bbfbb1da816b55
Eric Fischer [Thu, 11 Nov 2010 23:45:50 +0000 (15:45 -0800)]
am
5c205262: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
5c205262460ecc5bcfb92ffb10185a573a4b7c90':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 11 Nov 2010 23:43:19 +0000 (15:43 -0800)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Dianne Hackborn [Thu, 11 Nov 2010 02:07:18 +0000 (18:07 -0800)]
am
83d2698f: Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
* commit '
83d2698f4f271f568333532ddbae33f8e2e13052':
Fix issue #
3177284: Account for wake lock power usage on Crespo
Dianne Hackborn [Thu, 11 Nov 2010 01:58:58 +0000 (17:58 -0800)]
Merge "Fix issue #
3177284: Account for wake lock power usage on Crespo" into gingerbread
Eric Fischer [Tue, 9 Nov 2010 20:19:25 +0000 (12:19 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ic9978f86bf778e815896bbe858e07d953d53843b
Dianne Hackborn [Tue, 9 Nov 2010 03:05:00 +0000 (19:05 -0800)]
Fix issue #
3177284: Account for wake lock power usage on Crespo
Change-Id: I5988d28fd192cd7fdb85140172a92141eb389964
Nick Pelly [Thu, 4 Nov 2010 02:59:47 +0000 (19:59 -0700)]
am
91ba0709: Update settings text on success, so we clear out error text after recovery.
* commit '
91ba0709b032d0c80ca086f53552f251a21c6df4':
Update settings text on success, so we clear out error text after recovery.
Nick Pelly [Thu, 4 Nov 2010 02:56:36 +0000 (21:56 -0500)]
Update settings text on success, so we clear out error text after recovery.
Change-Id: Ie6bff9f1b56d0218120cf98638b9cbfe505bd02d
Signed-off-by: Nick Pelly <npelly@google.com>
Dianne Hackborn [Fri, 29 Oct 2010 22:40:36 +0000 (15:40 -0700)]
am
4e4ed14e: Fix issue #
3146784: ANR in manage applications
* commit '
4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7':
Fix issue #
3146784: ANR in manage applications
Dianne Hackborn [Fri, 29 Oct 2010 20:49:20 +0000 (13:49 -0700)]
Fix issue #
3146784: ANR in manage applications
See the big comment.
Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
Jean-Baptiste Queru [Tue, 26 Oct 2010 00:32:17 +0000 (17:32 -0700)]
am
8815f032: Merge "Always set right auth_type value in apn."
Merge commit '
8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp
* commit '
8815f03202abf3117b6a1f6a058a835915ddae04':
Always set right auth_type value in apn.
OSDN Git Service
