Eric Fischer
d77b6a9b41
Merge "Import revised translations."
2010-12-10 10:55:54 -08:00
John Reck
8f48ad481d
Merge "Fixes Android HTTP cache permissions"
2010-12-10 10:21:56 -08:00
Eric Fischer
45956d577f
am af22f4f1: (-s ours) am 767926bb: Import revised translations. DO NOT MERGE
...
* commit 'af22f4f16da1823a14f5f60012dffafb14b0d02b':
Import revised translations. DO NOT MERGE
2010-12-10 10:08:10 -08:00
Eric Fischer
c95e5288c5
am 767926bb: Import revised translations. DO NOT MERGE
...
* commit '767926bbe90358bc3857f4b78f54c8cdacfb8773':
Import revised translations. DO NOT MERGE
2010-12-10 10:03:55 -08:00
Jean-Baptiste Queru
8c605feb4f
am 81266d99: am a218e014: reconcile with open-source gingerbread
...
* commit '81266d9936605ab3fb6347d28cd7f4a81d6e23e0':
2010-12-10 08:54:14 -08:00
Jean-Baptiste Queru
63fa070253
am a218e014: reconcile with open-source gingerbread
...
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
2010-12-10 08:49:37 -08:00
James Dong
9373a724d3
Merge "We requires camera hal's implementation should not track the ref count of any outstanding video frames and ignore releaseRecordingFrame() call after it receives disableMsgType(CAMERA_MSG_VIDEO_FRAME)."
2010-12-10 07:33:13 -08:00
Ben Murdoch
ccac87de81
Merge "Add a "Web Search" option to the WebView select text ActionBar"
2010-12-10 05:52:03 -08:00
Adam Powell
fded57d33a
Merge "Holo scrollbars and related tweaks."
2010-12-09 23:02:11 -08:00
Mike Lockwood
1b64f9cf56
Merge "Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService"
2010-12-09 22:53:27 -08:00
James Dong
4f7d7be7a3
Merge "First step towards renabling Timelapse video recording"
2010-12-09 20:27:59 -08:00
Dianne Hackborn
eda331c952
Merge "Fix issue #3272051 : Use backward transition when going backwards."
2010-12-09 19:25:17 -08:00
Jeff Brown
abed74c8c4
Merge "Fix race condition in fallback key processing."
2010-12-09 18:54:35 -08:00
Mike Lockwood
0049d8aa38
Merge "MTP host: Handle receiving a response packet instead of data packet."
2010-12-09 18:42:13 -08:00
Jeff Brown
7999039b77
Fix race condition in fallback key processing.
...
Need to ensure that the channel is still valid before proceeding.
Bug: 3271482
Change-Id: Ia6863cbedd9b53cbc5c9c8815e9ea90bef3d2218
2010-12-09 18:14:23 -08:00
Romain Guy
08b01a41c7
Merge "Don't set the invisible flag when saving an empty layer. Bug #3270371 "
2010-12-09 17:47:09 -08:00
John Wang
220e8092c7
Merge "Add config_sms_capable."
2010-12-09 17:31:36 -08:00
Svetoslav Ganov
4f9da642af
Merge "3205857 java.lang.ExceptionInInitializerError at java.lang.Class.newInstanceImpl(Native Method)"
2010-12-09 14:47:22 -08:00
Alon Albert
afac604330
Merge "Listen for SyncAdapter death to cancel a sync"
2010-12-09 14:08:27 -08:00
Wink Saville
11dc2adfea
am a7404130: am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."
...
* commit 'a740413022baca3d2bc365ade40f73a1fee46654':
Fix for phone app crash in Icc Card.
2010-12-09 14:06:35 -08:00
Wink Saville
1999478105
am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card."
...
* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
Fix for phone app crash in Icc Card.
2010-12-09 14:02:09 -08:00
Wink Saville
3c41ac797a
am 19b23afa: Merge "Fix for phone app crash in Icc Card."
...
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
Fix for phone app crash in Icc Card.
2010-12-09 13:58:26 -08:00
Wink Saville
d4d8eb5060
Merge "Fix for phone app crash in Icc Card."
2010-12-09 13:50:28 -08:00
Mike Lockwood
631ae4c880
Merge "CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP"
2010-12-09 13:45:34 -08:00
Eric Laurent
6c8bc690bc
Merge "libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode"
2010-12-09 13:30:07 -08:00
Justin Ho
00e74a5778
Merge "Adding updated HDPI chat stat_notify icon"
2010-12-09 13:29:16 -08:00
Dianne Hackborn
7e28657d56
Merge "Fix issue #3271486 : SetupWizward NullPointerException in"
2010-12-09 13:16:49 -08:00
Christopher Tate
d2c839b7c1
Merge "Add a couple of transport-descriptive methods to IBackupManager"
2010-12-09 13:06:46 -08:00
John Wang
a90ce160ba
Merge "Add iDEN to getNetworkTypeName."
2010-12-09 12:53:01 -08:00
Jason Sams
271e031e14
Merge "Fix a severe cleanup bug where teardown of the GL driver could occur on the wrong thread."
2010-12-09 12:21:19 -08:00
Ben Murdoch
d8132bea02
Merge "Make audio tag cope with live streams"
2010-12-09 11:54:24 -08:00
Amith Yamasani
8b1c68e09e
Merge "Remove the OnItemClick listener when the fragment is destroyed."
2010-12-09 11:45:32 -08:00
Leon Scroggins
3661164663
Merge "Dismiss IME when pressing Next or Previous."
2010-12-09 11:04:06 -08:00
Mindy Pereira
682a426105
Merge "Make sure bottom overscroll feedback takes scrollY into account."
2010-12-09 10:55:39 -08:00
Jean-Baptiste Queru
af401af16e
am 1bec55bd: am d9c17cc1: merge from gingerbread
...
* commit '1bec55bd244f72c65fa254118a72ad3ed10aa845':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:48:54 -08:00
Jean-Baptiste Queru
03e3c1afbd
am d9c17cc1: merge from gingerbread
...
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
Add more checks for bad values to protect from corrupt files.
Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
2010-12-09 10:45:29 -08:00
Jean-Baptiste Queru
c288fb7ef3
reconcile with open-source gingerbread
...
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
2010-12-09 10:18:23 -08:00
Andy Stadler
e6dc0d6c86
Merge "API CHANGE - Add hasGrantedPolicy() API"
2010-12-09 10:05:27 -08:00
Dianne Hackborn
13b18eadd1
Merge "Fix not saving state when restarting an activity."
2010-12-09 09:28:26 -08:00
Jean-Baptiste Queru
062afde24e
merge from gingerbread
...
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
2010-12-09 09:11:06 -08:00
Mike Lockwood
48ca9048e5
Merge "Rehide the PTP content provider interface from the public API."
2010-12-09 08:42:56 -08:00
satok
fe746b7e84
Merge "Change the initial visibility of IME switch button"
2010-12-09 08:10:53 -08:00
Kristian Monsen
d1fc9a8da0
Merge "Make CookieManager.removeSessionCookies async"
2010-12-09 07:26:01 -08:00
Amith Yamasani
f73ae87071
Merge "Move the breadcrumbs to the right pane."
2010-12-09 04:20:04 -08:00
Jason Sams
f8402fa4cf
Merge "Allocation API update."
2010-12-08 23:46:28 -08:00
Wink Saville
03c495a537
am cc41b92e: am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
...
* commit 'cc41b92ed7e66cc5d4e14f22b3ea914175d662ec':
frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 22:00:58 -08:00
Wink Saville
92f18fbd33
am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
...
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:57:03 -08:00
Wink Saville
3495638091
am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
...
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
frameworks/base/telephony: Release wakelock on RIL request send error
2010-12-08 21:53:24 -08:00
Wink Saville
bf741e9dfc
Merge "frameworks/base/telephony: Release wakelock on RIL request send error"
2010-12-08 21:37:38 -08:00
Jesse Wilson
ceaf72d375
Merge "Make doclava happy by returning the same type in old and new APIs."
2010-12-08 19:13:34 -08:00