Daniel Sandler
f8720fe1a8
Merge "Fix build."
2010-11-30 13:18:36 -08:00
Andreas Huber
9912a639c1
am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
...
* commit '567b2bd1469b1c37e6249637d313253b7d84971e':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
2010-11-30 13:07:56 -08:00
Andreas Huber
03d305cfea
Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
2010-11-30 13:00:14 -08:00
Daniel Sandler
b2642cbb60
Merge "When updating notifications, always reuse the last row."
2010-11-30 12:48:31 -08:00
Eric Laurent
aaf4046203
am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
...
* commit '688f4c58d4a7590ad47c219af3a5b8479d3a084d':
Update java doc for visualizer FFT capture.
2010-11-30 11:56:00 -08:00
Andreas Huber
fde5bc50f2
am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
...
* commit 'b690e55d3f713d68c6ed9654a05a5370bda731d5':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-11-30 11:53:01 -08:00
Eric Laurent
528648d56f
Merge "Update java doc for visualizer FFT capture." into gingerbread
2010-11-30 11:50:25 -08:00
Dirk Dougherty
915f0c59c7
am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
...
* commit '04d2cc05a2a59bf61bead85d58bc4c186392d91d':
Do not merge: Doc change: API diff report for gingerbread.
2010-11-30 11:48:51 -08:00
Dirk Dougherty
e45fcf3c7a
am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
...
* commit '50f8445edd14a21ad86080ff7b204eefdc2c62d5':
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-11-30 11:48:46 -08:00
Eric Fischer
b192c271eb
am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '3e6fb5d66eed34c91b9b056ad2d4c317186476fd':
Import revised translations. DO NOT MERGE
2010-11-30 11:48:00 -08:00
Wink Saville
46abef4b46
am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
...
* commit 'f316679971be356dbb01f991e95742bc5f2a8383':
Fix GSM permanent failure handling, DO NOT MERGE.
2010-11-30 11:46:34 -08:00
Ben Murdoch
92a9946c6b
am 27e728f2: Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
...
* commit '27e728f22d954caa7252be6c19a67a9277e1db3b':
Hide plugin views when we start playing HTML5 video
2010-11-30 11:46:24 -08:00
Hung-ying Tyan
0c35b2752f
am 349f3509: Merge "Correct SipService.isOpened() implementation." into gingerbread
...
* commit '349f3509f7335bbdef443a75afa36fb3c2d9552c':
Correct SipService.isOpened() implementation.
2010-11-30 11:46:15 -08:00
Hung-ying Tyan
620d026389
am d9e12303: Merge "Notify SipSessions before closing SIP stack." into gingerbread
...
* commit 'd9e12303d279654afe16319f948f93490cd1b4d5':
Notify SipSessions before closing SIP stack.
2010-11-30 11:46:08 -08:00
Hung-ying Tyan
003a6e8edc
am 0bba9535: Merge "Throw proper exceptions in SipManager" into gingerbread
...
* commit '0bba9535413f9ceefe03f1cef9ddaddccd05cae5':
Throw proper exceptions in SipManager
2010-11-30 11:46:01 -08:00
Chia-chi Yeh
425027d179
am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
...
* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
2010-11-30 11:45:54 -08:00
Irfan Sheriff
dc848fc447
am ee93169e: Merge "DO NOT MERGE fix runstate race condition" into gingerbread
...
* commit 'ee93169ed1072d3be627601223dafbcc061e7568':
DO NOT MERGE fix runstate race condition
2010-11-30 11:45:45 -08:00
Chia-chi Yeh
93c691619b
am bd399b0b: Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread
...
* commit 'bd399b0bd205a1a3889bae1a619c6d4d4a0f4816':
RTP: Pause echo suppressor when far-end volume is low.
2010-11-30 11:45:31 -08:00
Andreas Huber
7b3e445b94
Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
2010-11-30 11:42:22 -08:00
Dirk Dougherty
c17743c07e
Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
2010-11-30 11:27:15 -08:00
Justin Ho
6eb5b2af23
Merge "Adding new ringtones and notifications"
2010-11-30 11:05:58 -08:00
Cary Clark
43617c0f54
Merge "use the original hit if the cache is killed"
2010-11-30 10:23:52 -08:00
Eric Fischer
8168a694dc
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-11-30 10:12:46 -08:00
Gilles Debunne
f88cbfbb01
Merge "Dragging inside the same TextView is a move instead of a copy."
2010-11-30 10:07:41 -08:00
Mike Lockwood
be8fce59f8
Merge "MTP: Don't fail in playlist transfer if not all playlist items can be found."
2010-11-30 09:22:00 -08:00
Mike Lockwood
e9a85ed601
Merge "MTP: Make sure buffer is big enough before reading the data packet"
2010-11-30 09:21:19 -08:00
Wink Saville
89912d32b2
Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
2010-11-30 08:15:41 -08:00
Ben Murdoch
4a49235a04
Merge "Hide plugin views when we start playing HTML5 video" into gingerbread
2010-11-30 02:43:29 -08:00
Hung-ying Tyan
570bed6841
Merge "Correct SipService.isOpened() implementation." into gingerbread
2010-11-30 00:56:57 -08:00
Hung-ying Tyan
b251e0f609
Merge "Notify SipSessions before closing SIP stack." into gingerbread
2010-11-30 00:54:51 -08:00
Hung-ying Tyan
bf08df28f3
Merge "Throw proper exceptions in SipManager" into gingerbread
2010-11-30 00:51:22 -08:00
Chia-chi Yeh
65b9c530a6
Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
2010-11-29 22:56:56 -08:00
Dianne Hackborn
d379cda915
Merge "Auto-show IME for dialogs on large screens."
2010-11-29 22:56:03 -08:00
Irfan Sheriff
017a1e7e83
Merge "DO NOT MERGE fix runstate race condition" into gingerbread
2010-11-29 22:26:52 -08:00
Chia-chi Yeh
fa7be2cf06
Merge "RTP: Pause echo suppressor when far-end volume is low." into gingerbread
2010-11-29 22:19:57 -08:00
Dirk Dougherty
20ad5ac449
am f4c2eaf2: am 47ccfcb0: Doc change: add AccelerometerPlay to the generated samples.
...
* commit 'f4c2eaf2628582abf6eb0cc335bc864d2c64f440':
Doc change: add AccelerometerPlay to the generated samples.
2010-11-29 18:19:38 -08:00
Dirk Dougherty
21b511dbd2
am 47ccfcb0: Doc change: add AccelerometerPlay to the generated samples.
...
* commit '47ccfcb015c06f12eb91ccbb1113c15a368960d8':
Doc change: add AccelerometerPlay to the generated samples.
2010-11-29 18:16:50 -08:00
Dianne Hackborn
dc1c66357b
Merge "Fix issue #3225529 : AlertDialogs are squishing their content views"
2010-11-29 18:14:35 -08:00
Andy Stadler
8cf6d0eb99
Merge "Update device password expiration/alarm behavior"
2010-11-29 18:11:58 -08:00
Costin Manolache
f30b58c182
Merge "Revert "Merge "Fix permission."" It breaks apps that rely on the wrong permission."
2010-11-29 18:06:07 -08:00
Jim Miller
09bd5cb056
Merge "Fix 3024522: Add "no lock screen" support to the framework."
2010-11-29 18:00:34 -08:00
Guang Zhu
7a4ab350e0
Merge "pass layout test list using external file"
2010-11-29 17:50:04 -08:00
Chris Tate
8bc47599ac
Merge "Ensure that the first post-restore backup pass is correct"
2010-11-29 17:32:15 -08:00
Dirk Dougherty
dd128b0a2d
am cb1af77f: am b1150edc: Remove HeavyWeight sample from generated html samples.
...
* commit 'cb1af77f1fefddb78b4540db7d4a1df673caffe2':
Remove HeavyWeight sample from generated html samples.
2010-11-29 17:15:47 -08:00
Dirk Dougherty
77aebc3e47
am b1150edc: Remove HeavyWeight sample from generated html samples.
...
* commit 'b1150edc22d97b36c626a460717803f22b9fa5f2':
Remove HeavyWeight sample from generated html samples.
2010-11-29 17:12:40 -08:00
Costin Manolache
164abbd87e
Merge "Fix permission."
2010-11-29 16:11:26 -08:00
Eric Fischer
d09a4ff135
Merge "Import revised translations."
2010-11-29 16:03:04 -08:00
Joe Onorato
9dca4602f8
Merge "Show the network type."
2010-11-29 15:53:48 -08:00
Scott Main
30fca82e77
Merge "docs: add preview sdk docs to provide an api overview and install steps, enable the 'preview' flag for the docs build revise sdk side nav for preview"
2010-11-29 15:23:31 -08:00
Olivier Bailly
8e04cc6ac7
Merge "fix int vs. pointer mismatch in return statement. Add missing include header for compilation on x86 target."
2010-11-29 15:12:33 -08:00