Hung-ying Tyan
55e2207ada
am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
...
* commit '14b6d0620b42d1bb3a55778ba452d838a0d89223':
SipService: registers broadcast receivers on demand.
SipService: release wake lock for cancelled tasks.
2011-01-29 09:31:19 -08:00
Jeff Brown
a413f9404d
am d8bdc06f: (-s ours) Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
...
* commit 'd8bdc06f8139231f1edc1a8bf22b637ebb790605':
Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-29 09:27:55 -08:00
Eric Fischer
a7d6b7e4b2
am 287fbba5: (-s ours) am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '287fbba5b88cfba1e55fd98979ebe83b4b8ed8f4':
Import revised translations. DO NOT MERGE
2011-01-29 09:13:21 -08:00
Dirk Dougherty
7b61263cfe
am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread
...
* commit '30a85ec7e8d79448fbd0d0af3ac25b656f8428c4':
Doc change: Add time-lapse video to 3.0 highlights.
2011-01-29 08:57:25 -08:00
Andreas Huber
300d37d2b8
am 70888c00: (-s ours) am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
...
* commit '70888c00a0371692a07132f0dd94208456dd44c1':
DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
2011-01-29 08:57:21 -08:00
Jean-Baptiste Queru
21e81dddc6
Merge 13212f83 from gingerbread-plus-aosp
...
Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670
2011-01-29 08:54:06 -08:00
Jim Miller
f181cf3c14
am 145643ca: (-s ours) am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread
...
* commit '145643ca4bb98a88977026ea4d7866e391d53dce':
Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
2011-01-29 08:47:55 -08:00
Jean-Baptiste Queru
2e84762231
Merge 34afc2cd from gingerbread-plus-aosp
...
Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28
2011-01-29 08:45:29 -08:00
Eric Fischer
5027c29088
am e49e30cc: (-s ours) am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'e49e30cc4d9411326735f15d92e8d7455467072f':
Import revised translations. DO NOT MERGE
2011-01-29 08:02:19 -08:00
Nick Pelly
8beb0a0866
am 32f7d50d: am 21d0a173: Fix build - javadoc.
...
* commit '32f7d50df147e4eb171044aad376bd1425fcf5e7':
Fix build - javadoc.
2011-01-29 08:02:04 -08:00
Jean-Baptiste Queru
2409f6b6b0
am 87d19759: Delete browerplugin tests - do not merge
...
* commit '87d197597c9130b10ba9d67f17ed81db26e35cd8':
Delete browerplugin tests - do not merge
2011-01-29 08:00:52 -08:00
Scott Main
c85b7581f1
am 51330184: am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread
...
* commit '51330184feb1b8d01ac48f4f13e4b91e7e334401':
cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
2011-01-29 07:59:28 -08:00
Jean-Baptiste Queru
c461fbc452
am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
...
* commit 'd4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
Delete browerplugin tests - do not merge
2011-01-29 07:58:36 -08:00
Jean-Baptiste Queru
2512def16d
am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge"
...
* commit '9720323a5138acafbe30da38d61eeac469b675a4':
Delete browerplugin tests - do not merge
2011-01-29 07:39:47 -08:00
Jean-Baptiste Queru
ffdc0440ec
Merge 55e124c4 from gingerbread-plus-aosp
...
Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377
2011-01-29 07:32:39 -08:00
Andreas Huber
9f1385bc2b
am efebdf4b: (-s ours) DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
...
* commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a':
DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-29 07:30:57 -08:00
Justin Ho
712a842b37
am 28c4f69a: Updated checkbox assets
...
* commit '28c4f69a938766076c14e8f5b07951ec2a9f610d':
Updated checkbox assets
2011-01-29 07:30:39 -08:00
Arnaud Ferir
4efa5a3d8c
am 5e81a6e2: Fix trace mismatch.
...
* commit '5e81a6e21e9977acd9dfafaf030bf51c8572a98f':
Fix trace mismatch.
2011-01-29 07:30:07 -08:00
Sylvain Fonteneau
a93e5f9af8
am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
...
* commit 'c5a418ecb7681159ae6674a4d91177c6841537b1':
Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-29 07:29:56 -08:00
John Wang
0b87cf22e0
am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
...
* commit '93300ce2d398195d5616a2e924eb4a785274538e':
Enable recovery in RIL wakelock release check.
2011-01-29 07:29:42 -08:00
Jean-Baptiste Queru
4d10702aee
Merge c896d85c from gingerbread
...
Change-Id: Ib739e79187ec95fdbb88f90f3d03fafd4a1f721a
2011-01-29 07:27:06 -08:00
Jean-Baptiste Queru
e6a6469f0a
Merge da01b4ab from gingerbread
...
Change-Id: I644f170fe18042ffb09b9b852321f68c651c7972
2011-01-29 07:17:22 -08:00
Jeff Hamilton
528a3b97f1
am e1e70c57: Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread
...
* commit 'e1e70c57613956dff0f14829f6385e26c323b609':
Allow null filters for foreground dispatch to act as catch all.
2011-01-29 07:09:21 -08:00
Jim Miller
6eee7f2dbc
am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.
...
* commit '42a461570b9c5502959e429c4f16ca5ca860c4f2':
Fix 3379239: Catch exceptions from workaround for OOM.
2011-01-29 07:08:58 -08:00
Robert Greenwalt
5184bce8ae
am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
...
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
2011-01-29 06:55:38 -08:00
Robert Greenwalt
6835f6094b
am 19eecb02: Merge "Don\'t use mobile networktype icon if not connected" into honeycomb
...
* commit '19eecb028fe094e5f41d9ddeb1e6aac1d096da43':
Don't use mobile networktype icon if not connected
2011-01-29 06:44:35 -08:00
Robert Greenwalt
62e5b62d7f
Merge "Add some network types that OEM's are asking for." into gingerbread
2011-01-29 06:38:35 -08:00
Robert Greenwalt
1fc7c8ff4b
Merge "Don't use mobile networktype icon if not connected" into honeycomb
2011-01-29 06:35:57 -08:00
Jean-Baptiste Queru
8e543c60f5
stubs
...
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
2011-01-29 06:19:37 -08:00
Justin Ho
631d53fd1c
am 9b1df164: Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
...
* commit '9b1df1646ff4d480eebe2fd9cd394915b7925e92':
Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style
2011-01-28 22:54:11 -08:00
Justin Ho
d453b0cbbf
Merge "Merging Honeycomb style ic_menu that are background safe, refreshed with Holo style" into honeycomb
2011-01-28 22:51:51 -08:00
Justin Ho
00ee7ba7d7
am 9371f703: Merge "New honeycomb sound set" into honeycomb
...
* commit '9371f7030011da2bcc45587e59a40a498f92dfb4':
New honeycomb sound set
2011-01-28 19:21:33 -08:00
Justin Ho
74c7bb3ccc
Merge "New honeycomb sound set" into honeycomb
2011-01-28 19:18:51 -08:00
Joe Onorato
33f49254b5
am a0f2cdb5: Merge "999" into honeycomb
...
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
999
2011-01-28 18:50:03 -08:00
Joe Onorato
67e95b1960
Merge "999" into honeycomb
2011-01-28 18:47:57 -08:00
Jaikumar Ganesh
c0cd516cde
am 1c9761e3: (-s ours) Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread
...
* commit '1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b':
Do Not Merge Connect other profiles when priority is auto connect.
2011-01-28 18:45:14 -08:00
John Reck
3089e2284a
am 398a589c: (-s ours) Merge "DO NOT MERGE - Create db path if it doesn\'t exit" into gingerbread
...
* commit '398a589ccea744556732b25097412dbb22c51271':
DO NOT MERGE - Create db path if it doesn't exit
2011-01-28 18:44:57 -08:00
Jeff Hamilton
1dd3301c8c
resolved conflicts for merge of dc54a8c7 to honeycomb-merge
...
Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8
2011-01-28 20:41:42 -06:00
Mathias Agopian
daabd7c228
am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
...
* commit '231da079c93664fa7d81c7e957990f17a6334b17':
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
2011-01-28 18:40:44 -08:00
Mathias Agopian
779160c4ea
Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb
2011-01-28 18:38:58 -08:00
Mathias Agopian
3cc2677efc
fix [3389263] OMX.Nvidia.h264.decode fails to shutdown
...
We were still destroying an ANativeWindow's buffer pretty soon
after it was removed from the window manager. This time
we really wait for the ISurace to go away.
Change-Id: I329273fedaeef76ee92836f6180c2c3808389330
2011-01-28 18:23:24 -08:00
Jamie Gennis
68f9127e88
Reset ANativeWindow crop on buffer geometry changes.
...
This changes the ANativeWindow API and the two implementations to reset
the window's crop rectangle to be uncropped when the window's buffer
geometry is changed.
Bug: 3359604
Change-Id: I64283dc8382ae687787ec0bebe6a5d5b4a0dcd6b
2011-01-28 18:21:54 -08:00
Jason Sams
07eb394e6d
am bd08c7c0: Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
...
* commit 'bd08c7c0c99fa84dbf3c043f4e6dff07320410b7':
Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection.
2011-01-28 18:00:09 -08:00
Jason Sams
c381806ae0
am c8f6b6fb: Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
...
* commit 'c8f6b6fbbc853bd89a7def780e8d9a4cabe6d0e2':
DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1.
2011-01-28 17:58:04 -08:00
Jason Sams
56a764c39c
Merge "Clean up RS samples for SDK, bug 2943369 Fix bug 3403965 rsgSyncAll would not mark constants as changed found by inspection." into honeycomb
2011-01-28 17:56:28 -08:00
Jason Sams
c5b1fe9236
Merge "DO NOT MERGE Bug 2943369 RS SDK Remove typedef for quat type which was pushed back to mr1." into honeycomb
2011-01-28 17:56:09 -08:00
Jean-Michel Trivi
58ac4b4923
am a314f32b: (-s ours) Merge "Bug 3365937 notify TTS initialization listener of binding errors" into gingerbread
...
* commit 'a314f32ba92d46687aef9f420eb61491eff485cf':
Bug 3365937 notify TTS initialization listener of binding errors
2011-01-28 17:37:12 -08:00
Xavier Ducrohet
02f5e29640
am f597f750: Merge "LayoutLib: update with Pair API." into honeycomb
...
* commit 'f597f750392a26e1bc33430ff52e2dd3674c875b':
LayoutLib: update with Pair API.
2011-01-28 17:23:45 -08:00
Xavier Ducrohet
0f962411f8
Merge "LayoutLib: update with Pair API." into honeycomb
2011-01-28 17:21:57 -08:00
Irfan Sheriff
3a8a479173
am 739f6bc6: Keep never as the default wifi sleep settings
...
* commit '739f6bc675c0caa11a1d46b18de24e6c884f723a':
Keep never as the default wifi sleep settings
2011-01-28 17:19:38 -08:00