OSDN Git Service
Kenny Root [Tue, 5 Feb 2013 00:20:46 +0000 (00:20 +0000)]
Merge "AndroidKeyStore: return error code on error"
Kenny Root [Mon, 4 Feb 2013 23:49:11 +0000 (15:49 -0800)]
AndroidKeyStore: return error code on error
Instead of blindly multiplying return value by 1000 to convert to
milliseconds, check to see if it's an error condition first.
Change-Id: I8eab1e7a86d78c13458fcbbc79d590e452fc9791
Kenny Root [Mon, 4 Feb 2013 23:05:08 +0000 (23:05 +0000)]
Merge "AndroidKeyStore: add key wrapping test"
Kenny Root [Mon, 4 Feb 2013 23:01:01 +0000 (23:01 +0000)]
Merge "AndroidKeyStore: fix tests"
Kenny Root [Mon, 4 Feb 2013 22:47:36 +0000 (14:47 -0800)]
AndroidKeyStore: add key wrapping test
Change-Id: Ib21ab37d22689dd87f014eaa1f7919a575367cdd
Kenny Root [Mon, 4 Feb 2013 22:47:23 +0000 (14:47 -0800)]
AndroidKeyStore: fix tests
Change-Id: I65fd8ba27af57ea8fd27c8e08c9c1201f32c494d
Kenny Root [Mon, 4 Feb 2013 19:21:25 +0000 (19:21 +0000)]
Merge "Function uri.getAuthority is called twice. Minor doc corrections."
Irfan Sheriff [Mon, 4 Feb 2013 18:09:27 +0000 (18:09 +0000)]
Merge "Change default intent"
Irfan Sheriff [Mon, 4 Feb 2013 17:37:07 +0000 (09:37 -0800)]
Change default intent
Older JB releases have a bug handling persistence invocation. One work
around right now is to have the newer release (with persistence)
use a lower intent value to allow older release to operate in group
owner mode.
Change-Id: I7ffb66081a352929a6f421e5d6141f592be7d472
Yury Zhauniarovich [Sat, 12 May 2012 16:39:25 +0000 (18:39 +0200)]
Function uri.getAuthority is called twice. Minor doc corrections.
Function uri.getAuthority was called twice in methods acquireProvider
and acquireExistingProvider was called twice although a parameter
representing the value had existed. The second call to the function is
changed to the parameter. The parameter's modifier changed to final.
Minor corrections in function descriptions in the file.
Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
Change-Id: Id003aa38c17d644357873c41a8f5ec455e46a4b7
Kenny Root [Wed, 30 Jan 2013 05:54:03 +0000 (05:54 +0000)]
Merge "One more fix for incorrect indices."
Amith Yamasani [Mon, 28 Jan 2013 18:46:37 +0000 (18:46 +0000)]
Merge "Added focusable true on search_button for D-pad."
Adam Powell [Mon, 28 Jan 2013 18:44:10 +0000 (18:44 +0000)]
Merge "show SELECT ALL icon with text in landscape mode"
Amith Yamasani [Mon, 28 Jan 2013 18:09:59 +0000 (18:09 +0000)]
Merge "Fix possible integer overflow in MtpStorage"
Irfan Sheriff [Mon, 28 Jan 2013 16:01:43 +0000 (16:01 +0000)]
Merge "Remove config_wifi_p2p_support from config.xml."
Kenny Root [Sat, 26 Jan 2013 00:26:01 +0000 (00:26 +0000)]
Merge "Track libcore changes for OpenSSLKey"
Kenny Root [Fri, 25 Jan 2013 22:08:52 +0000 (22:08 +0000)]
Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
Sungmin Choi [Fri, 25 Jan 2013 12:39:01 +0000 (21:39 +0900)]
show SELECT ALL icon with text in landscape mode
Though set config_allowActionMenuItemTextWithIcon as true,
icon for the "SELECT ALL" menu on ActionBar is not shown as staring
in landscape mode.
To fix it, use "SELECT ALL" icon in onCreateActionMode() to show the
icon and text together.
To show or hide text is decided by updateTextButtonVisibility() of
core/java/com/android/internal/view/menu/ActionMenuItemView.java
STEPS TO REPRODUCE: (please be specific)
1. launch Browser/Chrome and go to google.com
2. rotate to landscape mode
3. long press on URL address
Bug:
8073761
Change-Id: Ie0e0aa45f0dff609ed8c03e4423b163bad5452ed
Yoshihiko Ikenaga [Fri, 25 Jan 2013 02:35:33 +0000 (11:35 +0900)]
Remove config_wifi_p2p_support from config.xml.
"config_wifi_p2p_support" is no longer used.
It was replaced with PackageManager.FEATURE_WIFI_DIRECT.
Change-Id: Ib57c5246b2ad218e65b4cbbb77fd37c04b5d9682
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Irfan Sheriff [Thu, 24 Jan 2013 17:38:51 +0000 (17:38 +0000)]
Merge "Fix WPS configuration method of BSS enrollee."
Yoshihiko Ikenaga [Thu, 24 Jan 2013 04:48:58 +0000 (13:48 +0900)]
Fix WPS configuration method of BSS enrollee.
Remove keypad from WPS configuration method of BSS enrollee
becuase JB UI does NOT support keypad, only supports pbc and
display.
Change-Id: I9ab6f1514805e8307b46e38261f1c657568aeb59
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
Ki-Hwan Lee [Tue, 8 Jan 2013 09:15:56 +0000 (18:15 +0900)]
Added focusable true on search_button for D-pad.
To give focus to search_button on ActionBar by using D-pad,
the search_button should be set focusable true.
How to reproduce:
(1) Open "API Demos" application -> App -> Action Bar -> Action Bar Usage
(2) Try to focus the Search View, using the D-pad.
Change-Id: Idc0b8e8d88391c152e0fc20467c23d03ab558f62
Wink Saville [Thu, 24 Jan 2013 00:39:38 +0000 (00:39 +0000)]
Merge "frameworks: Display missing text on SimUnlockScreen"
Wink Saville [Wed, 23 Jan 2013 17:15:58 +0000 (17:15 +0000)]
Merge "Telephony: Consider EVDO ecio zero value as valid."
Stephen Hines [Wed, 23 Jan 2013 02:29:41 +0000 (18:29 -0800)]
One more fix for incorrect indices.
Change-Id: I283f2f09cd0a17eefed4a763b08df856bbae76b3
Christopher Tate [Wed, 23 Jan 2013 01:49:58 +0000 (01:49 +0000)]
Merge "Fix array index oob in Matrix3f.loadRotate()."
Stephen Hines [Wed, 23 Jan 2013 00:01:44 +0000 (16:01 -0800)]
Fix array index oob in Matrix3f.loadRotate().
https://code.google.com/p/android/issues/detail?id=42860
Change-Id: Idbf18576da3ad5b84b4209147dad34cc2f9044d2
Kenny Root [Tue, 22 Jan 2013 21:25:38 +0000 (13:25 -0800)]
Track libcore changes for OpenSSLKey
Change-Id: I39f60c34daa9ccc633efb02988ea238a84e6bbf1
Elliott Hughes [Tue, 22 Jan 2013 23:19:19 +0000 (23:19 +0000)]
Merge "fix typo for symbol"
John Reck [Tue, 22 Jan 2013 21:12:48 +0000 (21:12 +0000)]
Merge "Fix for truncated sentence in "Find on Page" field"
Alex Klyubin [Fri, 18 Jan 2013 20:50:39 +0000 (12:50 -0800)]
Add TLS Channel ID support to SSLCertificateSocketFactory.
This adds a new method setChannelIdPrivateKey as a hidden API.
See http://tools.ietf.org/html/draft-balfanz-tls-channelid-00 for
more information about the TLS Channel ID extension.
Change-Id: I73c1905afdce01d4831de7faa55ea4496575b5a5
Elliott Hughes [Thu, 17 Jan 2013 18:19:49 +0000 (18:19 +0000)]
Merge "Track a typo fix in hidden libcore API."
Elliott Hughes [Thu, 17 Jan 2013 17:24:47 +0000 (09:24 -0800)]
Track a typo fix in hidden libcore API.
Change-Id: I6fa3c2ef7f4d73bbf6557560e46c7c11bff74a32
Sungmin Choi [Thu, 17 Jan 2013 01:19:22 +0000 (10:19 +0900)]
fix typo for symbol
remove duplicated symbol (sliding_layout)
Change-Id: I401de3832328731d554dd4cda991b77b99454579
Stefan Wysocki [Tue, 18 Sep 2012 12:11:20 +0000 (14:11 +0200)]
Fix for truncated sentence in "Find on Page" field
When typing a text in find on page, then deleting it again the
default text in the field "Find on Page" is truncated by
an invisible view.
This commit fixes the problem by setting the visibility of
mMatches view changes to View.GONE instead of View.INVISIBLE.
Change-Id: I9889f22a254cdabb0cbaba72bff4b14158e5c9ff
Elliott Hughes [Tue, 15 Jan 2013 02:06:26 +0000 (18:06 -0800)]
Merge "Manual fix for some Norwegian format strings."
Elliott Hughes [Tue, 15 Jan 2013 01:48:30 +0000 (17:48 -0800)]
Manual fix for some Norwegian format strings.
Fixing these properly (by removing these donottranslate-cldr.xml files
completely) is blocked on icu4c, so manually fix a few strings in the
meantime.
Bug: http://code.google.com/p/android/issues/detail?id=21859
Change-Id: If91ec70ad4c9e0944deee1cb55382e94ac1b7278
Elliott Hughes [Tue, 15 Jan 2013 01:01:51 +0000 (17:01 -0800)]
Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c."
Elliott Hughes [Mon, 14 Jan 2013 23:48:27 +0000 (15:48 -0800)]
Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
I removed the duplication in DateTimeView rather than fix that copy
of the code.
Bug:
7924970
Change-Id: I60c205d06ad3b50fd2f5d5fc432e4eb186f9c0e7
Christopher Tate [Mon, 14 Jan 2013 18:47:07 +0000 (10:47 -0800)]
Merge "Fix the spelling of "retrieves""
Scott Kennedy [Sat, 12 Jan 2013 05:50:31 +0000 (21:50 -0800)]
Fix the spelling of "retrieves"
Change-Id: I33360c573a6ca7b88d0cac834caad547d66b0b2a
Christopher Tate [Fri, 11 Jan 2013 01:39:33 +0000 (17:39 -0800)]
Merge "TIME_TICK was not occurred for one hour"
Sungmin Choi [Thu, 10 Jan 2013 08:28:40 +0000 (17:28 +0900)]
TIME_TICK was not occurred for one hour
TIME_TICK was not occurred at the end of DST for one hour
Step to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time and Automatic time zone
3. select Time zone -> select Brussels
4. set date -> Oct. 28. 2012
5. set time -> 1:59 AM
Bug:
7922117
Change-Id: I2e78bd97b508d6a38471425cfbaca45fb4b89c1e
Henrik Engström [Thu, 29 Nov 2012 14:29:35 +0000 (15:29 +0100)]
Fix possible integer overflow in MtpStorage
When converting the MB value MtpReserveSpace value to bytes there is a
possible integer overflow since 3 integer values are multiplied, even
though the result is stored in a long variable. This would be visible when
the value is more than 2 GB. This is solved by making the constants
longs instead of ints.
Change-Id: I799129f7076a6e331cece17b5c05aed210499648
Dianne Hackborn [Mon, 7 Jan 2013 23:20:45 +0000 (15:20 -0800)]
Merge "Handle nested folder case"
Dianne Hackborn [Mon, 7 Jan 2013 20:17:25 +0000 (12:17 -0800)]
Merge "Setting the default value for dock audio"
Dianne Hackborn [Mon, 7 Jan 2013 19:21:54 +0000 (11:21 -0800)]
Merge "Correcting typo in doc of MEDIA_XXX intents"
Dianne Hackborn [Mon, 7 Jan 2013 19:19:11 +0000 (11:19 -0800)]
Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
Brian Carlstrom [Fri, 4 Jan 2013 23:40:34 +0000 (15:40 -0800)]
Merge "Use most specific attributes for distinguished name display"
Brian Carlstrom [Sat, 22 Dec 2012 01:28:04 +0000 (17:28 -0800)]
Use most specific attributes for distinguished name display
Bug:
7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
suyi Yuan [Fri, 4 Jan 2013 13:21:59 +0000 (21:21 +0800)]
Correcting typo in doc of MEDIA_XXX intents
Correcting typo in documents of MEDIA_MOUNTED,
MEDIA_UNMOUNTED,MEDIA_UNMOUNTABLE intents, which
may be confusing to APP developers.
Change-Id: Id909b7bfad98e305b8054978f054f4fb9b705311
Roger Chen [Mon, 17 Dec 2012 05:31:17 +0000 (13:31 +0800)]
Handle nested folder case
Change-Id: Id6d6a5899e8255d18192adbc766d8d9a0e6825d0
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
Elliott Hughes [Fri, 4 Jan 2013 01:40:55 +0000 (17:40 -0800)]
Merge "Revert "fix potential memory leak""
Elliott Hughes [Fri, 4 Jan 2013 01:38:57 +0000 (17:38 -0800)]
Revert "fix potential memory leak"
This reverts commit
bc268b9014f211910e412a7fda96b6394ff2badc
Change-Id: I07f49bd0cfecc43bc761d2b0635c9915a8e30272
Elliott Hughes [Fri, 4 Jan 2013 01:35:57 +0000 (17:35 -0800)]
Merge "fix potential memory leak"
Sungmin Choi [Fri, 21 Dec 2012 05:25:38 +0000 (14:25 +0900)]
fix potential memory leak
use delete before return
Change-Id: I5449ad90bb6910f057bd825b722c9803a7343c34
Adam Powell [Fri, 4 Jan 2013 00:46:02 +0000 (16:46 -0800)]
Merge "Fix NullpointException problem in onMenuItemSelected"
Wink Saville [Thu, 3 Jan 2013 22:49:05 +0000 (14:49 -0800)]
Merge "frameworks/base: Support for LTE network modes"
Victoria Lease [Wed, 2 Jan 2013 22:15:51 +0000 (14:15 -0800)]
Merge "Fix logging typos in GpsLocationProvider"
Uma Maheswari Ramalingam [Tue, 10 Jul 2012 21:55:39 +0000 (14:55 -0700)]
frameworks/base: Support for LTE network modes
Change-Id: I93c102f92ff2d10856d91108bb50fe5c0f06ad66
Amith Yamasani [Wed, 2 Jan 2013 17:00:28 +0000 (09:00 -0800)]
Merge "Fixed typo in Recreating an Activity documentation"
Elliott Hughes [Sat, 22 Dec 2012 01:17:41 +0000 (17:17 -0800)]
Merge "StringBlock_nativeCreate: Possible Leak"
Gulshan Singh [Fri, 21 Dec 2012 22:13:43 +0000 (17:13 -0500)]
Fixed typo in Recreating an Activity documentation
The word although was spelled as althought. This is now fixed.
Signed-off-by: Gulshan Singh <gsingh2011@gmail.com>
Change-Id: Ia28a081bf9d8ab8be831c685cbfa4ddad3618a87
James Dong [Fri, 21 Dec 2012 22:05:09 +0000 (14:05 -0800)]
Merge "Handle errors from AudioEffect::queryNumberEffects"
James Dong [Fri, 21 Dec 2012 21:34:41 +0000 (13:34 -0800)]
Merge "Set "isdrm" info in Mediastore"
Magnus Eriksson [Fri, 21 Dec 2012 20:07:28 +0000 (21:07 +0100)]
Fix logging typos in GpsLocationProvider
Change-Id: Ibf12947f3758defee990fbf685323334b8d1eeda
Signed-off-by: Magnus Eriksson <eriksson.mag@gmail.com>
Irfan Sheriff [Thu, 20 Dec 2012 22:43:16 +0000 (14:43 -0800)]
Merge "NsdService: Clear client info after resolution request is serviced."
You Kim [Thu, 20 Dec 2012 21:19:38 +0000 (06:19 +0900)]
StringBlock_nativeCreate: Possible Leak
osb can be leaked when osb->getError() != NO_ERROR
Change-Id: Icbeb8eb3fb78849c043fe032cc8f7050da041042
Victoria Lease [Thu, 20 Dec 2012 20:09:48 +0000 (12:09 -0800)]
Merge "Possible leak in android_emoji_EmojiFactory_newInstance"
Andrew Hsieh [Thu, 20 Dec 2012 00:10:10 +0000 (16:10 -0800)]
Merge "Fix typo"
Glenn Kasten [Wed, 19 Dec 2012 16:47:20 +0000 (08:47 -0800)]
Merge "Leak in ToneGenerator_native_setup"
Dmytro Dubovyk [Tue, 18 Dec 2012 16:07:50 +0000 (18:07 +0200)]
Setting the default value for dock audio
There was no default value for parameter "dock_audio_media_enabled"
in global settings and because of that it couldn't be obtained before
Settings app first start and improper actions, such as FORCE_NONE
sending to AudioSystem instead of FORCE_ANALOG_DOCK, were taken.
This patch sets default value to 'true'.
Change-Id: Idbe343519db15f806f3a237e8b39f8420b9edde1
Signed-off-by: Dmytro Dubovyk <dmytro.dubovyk@ti.com>
Andrew Hsieh [Wed, 19 Dec 2012 03:21:38 +0000 (11:21 +0800)]
Fix typo
Change-Id: I58f863c4eb1eb4196d001c280027ab59bee51ce4
Elliott Hughes [Wed, 19 Dec 2012 02:06:07 +0000 (18:06 -0800)]
Merge "Update the JNI spec link, and remove a dead link."
Elliott Hughes [Wed, 19 Dec 2012 01:24:36 +0000 (17:24 -0800)]
Update the JNI spec link, and remove a dead link.
Also remove the duplicate copy of this file. There's a redirect in place
from the old location.
Bug: http://code.google.com/p/android/issues/detail?id=41623
Change-Id: I521b640fdef17c98582171d97214486d16e774e4
Robert Greenwalt [Tue, 18 Dec 2012 19:02:51 +0000 (11:02 -0800)]
Merge "Return error upon attempt to use non-existent APN"
Mikael Hedegren [Fri, 14 Dec 2012 14:52:52 +0000 (15:52 +0100)]
Return error upon attempt to use non-existent APN
startUsingNetworkFeature will ignore errors from
reconnect - causing ConnectivityService to send
faulty information back to requester.
Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
Adam Powell [Mon, 17 Dec 2012 22:39:56 +0000 (14:39 -0800)]
Merge "Memory leak due to bad destroy sequence"
Christopher Tate [Mon, 17 Dec 2012 18:39:41 +0000 (10:39 -0800)]
Merge "BackupHelpers: Fix Typo"
Craig Mautner [Mon, 17 Dec 2012 17:05:07 +0000 (09:05 -0800)]
Merge "Toast: fix force close if called from system service"
Pawit Pornkitprasan [Mon, 17 Dec 2012 10:57:51 +0000 (17:57 +0700)]
Toast: fix force close if called from system service
If a toast is created from a system service, an application context
will not be available, use the service context instead.
Fixes
http://code.google.com/p/android/issues/detail?id=40058
http://code.google.com/p/android/issues/detail?id=40075
Change-Id: Ic643f4557fa04476819cd2c3ee640b735eeae429
You Kim [Sun, 16 Dec 2012 18:36:10 +0000 (03:36 +0900)]
BackupHelpers: Fix Typo
delete --> free
Change-Id: Idbf7e677f8cc4a9a9d04e58b5cf7d0f1589c5211
Elliott Hughes [Sat, 15 Dec 2012 01:39:19 +0000 (17:39 -0800)]
Merge "Fix DateUtils.formatElapsedTime."
zobject [Fri, 14 Dec 2012 12:11:08 +0000 (21:11 +0900)]
Fix NullpointException problem in onMenuItemSelected
If both title and condensed title is null,
item.getTitleCondensed() could be return null value
in onMenuItemSelected. therefore need to check
whether retun value is null or not.
Change-Id: Ib08f52b949a794aa7bd6cc25414041e820f62969
Elliott Hughes [Fri, 14 Dec 2012 22:29:47 +0000 (14:29 -0800)]
Fix DateUtils.formatElapsedTime.
More reuse of StringBuilders, less broken home-grown formatting code.
Long-term, we should hand this over to icu4c, but they're not ready yet.
Bug: http://code.google.com/p/android/issues/detail?id=41401
Bug:
7736688
Change-Id: Ib3c1e1aad05827df646aa18645cce19dffb7551f
Marco Nelissen [Fri, 14 Dec 2012 17:35:26 +0000 (09:35 -0800)]
Merge "fix typo in docs"
Elliott Hughes [Fri, 14 Dec 2012 17:19:45 +0000 (09:19 -0800)]
Merge "Add return after NULL check in JetPlayer"
Amith Yamasani [Fri, 14 Dec 2012 17:04:30 +0000 (09:04 -0800)]
Merge "avoid crashing system serer process"
Jean-Christophe PINCE [Tue, 9 Oct 2012 14:17:33 +0000 (16:17 +0200)]
Memory leak due to bad destroy sequence
During the destroy sequence, it happens that the mWebViewClassic was
set to null in the transferMessages function and consequently, the
call to WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic) is
not really removing the view from the watchdog's list; creating a
memory leak.
Change-Id: I2bae7c8d7c473e2af25e62a485699f88269d6658
Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 57869
Jeff Sharkey [Wed, 12 Dec 2012 18:41:20 +0000 (10:41 -0800)]
Merge "Remove unnecessary locking for screen broadcasts."
Adam Powell [Wed, 12 Dec 2012 02:00:48 +0000 (18:00 -0800)]
Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
Adam Powell [Wed, 12 Dec 2012 01:57:58 +0000 (17:57 -0800)]
Merge "Fix regression in ListView click handling"
Robert Greenwalt [Wed, 12 Dec 2012 00:34:35 +0000 (16:34 -0800)]
Merge "return value of String.replace() is ignored."
Adam Powell [Tue, 11 Dec 2012 23:41:17 +0000 (15:41 -0800)]
Fix regression in ListView click handling
Regression caused by patch
a607223f34
If an item click handler results in the ListView becoming detached
from the window, the performClick runnable could be executed twice.
Null out the mTouchModeReset runnable before running the click handler
so that it is not run by the detach handler.
Change-Id: I2fab60232027bb4876f9912088e0ffb9b17d308c
You Kim [Tue, 11 Dec 2012 20:34:21 +0000 (05:34 +0900)]
Add return after NULL check in JetPlayer
When pointer lpJet is NULL, it should return.
Change-Id: Ia0471173b57da8f9bf22b3a19479aa5b3c4a5acb
Emma Sajic [Sun, 9 Dec 2012 13:32:05 +0000 (13:32 +0000)]
Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
Fix for Issue ID 18316. Make isEmpty() return false when getCount() returns a non-zero value. So that the list cannot be considered empty when a header or footer is present.
https://code.google.com/p/android/issues/detail?id=18316
Change-Id: Ib69201e9d5ef3efcbb68ea298b8cc8ca6e027246
Signed-off-by: Emma Sajic <esajic@effectivelateralsolutions.co.uk>
You Kim [Mon, 10 Dec 2012 21:06:25 +0000 (06:06 +0900)]
Possible leak in android_emoji_EmojiFactory_newInstance
jchars is not released correctly if factory is NULL.
In addition, unnecessary string conversion removed.
Change-Id: I3ea58391dfe7a96ea6d6ae61bb0867a2d8d49fb0
Wink Saville [Tue, 11 Dec 2012 01:03:46 +0000 (17:03 -0800)]
Merge "Add config_speed_up_audio_on_mt_calls option"
Wink Saville [Mon, 10 Dec 2012 22:13:18 +0000 (14:13 -0800)]
Merge "Telephony: Use IccUtils from uicc package"
Adam Powell [Mon, 10 Dec 2012 19:09:32 +0000 (11:09 -0800)]
Merge "Fix EventLog string class problem in onOptionMenuSelected"