Simon Wilson
42a45d036e
am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 12:25:25 -07:00
Eric Fischer
6207a8e760
am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
Import revised translations. DO NOT MERGE
2011-04-04 12:20:38 -07:00
Jason parks
5c952fc1d3
am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
...
* commit 'cca2f2f987ab772a4bae3176df7259f59d6502ce':
Send out a broadcast that the system is being factory reset.
2011-04-04 12:20:33 -07:00
Justin Ho
6e8e2655a0
am 87805ca3: Updated CDMA roaming icons
...
* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
Updated CDMA roaming icons
2011-04-04 12:19:39 -07:00
Jean-Baptiste Queru
6952674762
am bef31431: No-op - reconcile with open-source gingerbread
...
* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':
2011-04-04 12:19:26 -07:00
Robert Greenwalt
8e5a5361d3
am 27725e8c: Only leave one default network up at a time.
...
* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Adam Cohen
458c89ec88
Merge "Fixing build"
2011-04-04 12:12:25 -07:00
Andreas Huber
1e8cc7b1f1
Merge "Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock."
2011-04-04 12:00:20 -07:00
Robert Ly
2df1d33f68
am cbfeda13: am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb
...
* commit 'cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225':
Adding package description for android.hardware.usb
2011-04-04 11:55:23 -07:00
Robert Ly
bfba112c17
am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb
...
* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
Adding package description for android.hardware.usb
2011-04-04 11:48:51 -07:00
Robert Ly
f73bad5173
am 3f39f653: Adding package description for android.hardware.usb
...
* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
Adding package description for android.hardware.usb
2011-04-04 11:41:02 -07:00
Adam Cohen
aa996ca3ea
Merge "Making StackView res-out and click feedback colors stylable"
2011-04-04 11:27:07 -07:00
Robert Greenwalt
eaea127a8b
Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
2011-04-04 11:23:51 -07:00
Robert Greenwalt
544de0b31f
resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp
...
Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd
2011-04-04 11:21:23 -07:00
Brad Fitzpatrick
c0c45b0dd0
am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
...
* commit '9907d161584415c81de1099678f160da172fd1a6':
Fix data corruption when writing to Bluetooth socket
2011-04-04 11:03:03 -07:00
Brad Fitzpatrick
5e29d67d7c
Merge "Fix data corruption when writing to Bluetooth socket"
2011-04-04 10:49:05 -07:00
Brad Fitzpatrick
e40f8ffe51
am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
...
* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
2011-04-04 10:17:43 -07:00
Brad Fitzpatrick
8deedde475
am e558a000: Merge "Avoid crash in system server when mounting container"
...
* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
Avoid crash in system server when mounting container
2011-04-04 10:17:35 -07:00
Brad Fitzpatrick
9f3c59adc5
Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
2011-04-04 09:41:10 -07:00
Brad Fitzpatrick
7ac7f79133
Merge "Avoid crash in system server when mounting container"
2011-04-04 09:38:16 -07:00
Dirk Dougherty
974e21c066
am 9e374cf4: am 826af857: am f9cdf7fe: Doc change: add diff report for API 12.
...
* commit '9e374cf4941c18059ce47b5eba9ace08d06f57b0':
Doc change: add diff report for API 12.
2011-04-03 14:07:49 -07:00
Dirk Dougherty
bc3afc3053
am 826af857: am f9cdf7fe: Doc change: add diff report for API 12.
...
* commit '826af8576b27d18997440bec75daa26434033c0c':
Doc change: add diff report for API 12.
2011-04-03 14:06:00 -07:00
Dirk Dougherty
88772c4a44
am f9cdf7fe: Doc change: add diff report for API 12.
...
* commit 'f9cdf7feb47aa142e11862f5694c0a29ac013a51':
Doc change: add diff report for API 12.
2011-04-03 14:04:20 -07:00
Dirk Dougherty
9051917e46
am b079c1f8: am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
...
* commit 'b079c1f8ee41e714b5273189014a5601598a8b62':
Doc change: update media formats tables with adts/aac and flac
2011-04-03 14:01:40 -07:00
Dirk Dougherty
a2a0d25ab5
am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
...
* commit '85709ac8e3340fb8114cfff7128a09d64c06cdc1':
Doc change: update media formats tables with adts/aac and flac
2011-04-03 13:56:07 -07:00
Dirk Dougherty
49cbaf290c
am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
...
* commit '1676920113d35b66e6e8846ffb7dded7e011c2fa':
Doc change: update media formats tables with adts/aac and flac
2011-04-03 13:50:48 -07:00
Dirk Dougherty
f084673183
Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
2011-04-03 13:40:48 -07:00
Brian Carlstrom
46619a89bb
Merge "Tracking merge of dalvik-dev to master"
2011-04-02 20:39:32 -07:00
Scott Main
7620355317
am e1e46c72: am 342d8fdb: am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb
...
* commit 'e1e46c7263948f5127f618e905fe5fb3ec0b3437':
docs: update device dashboard
2011-04-01 17:45:41 -07:00
Scott Main
f5a6e2bac9
am 342d8fdb: am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb
...
* commit '342d8fdbb6ee256da90ada3e48e198bbc9e8d8e3':
docs: update device dashboard
2011-04-01 17:43:12 -07:00
Scott Main
0a4c44aa6d
am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb
...
* commit '90a1befa551a9e6dc8f06b7331e26e6470ab824f':
docs: update device dashboard
2011-04-01 17:41:40 -07:00
Scott Main
5d539a12dc
am 27690eba: Merge "docs: update device dashboard" into honeycomb
...
* commit '27690ebabc915091956f0331023c9d074177271d':
docs: update device dashboard
2011-04-01 17:39:05 -07:00
Scott Main
03226aa1e9
Merge "docs: update device dashboard" into honeycomb
2011-04-01 17:36:42 -07:00
Wink Saville
007f1adb8d
am 22cfcaee: am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
...
* commit '22cfcaee24829e52c636ca2f5df0285569c6e7c1':
Data Retry fix after failure due to permanent causes.
2011-04-01 16:38:43 -07:00
Wink Saville
8301d0fcb3
am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
...
* commit '0b8e313c7f97f9cb34e2ba555182621889b69a16':
Data Retry fix after failure due to permanent causes.
2011-04-01 16:36:25 -07:00
Wink Saville
6d01167df4
Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
2011-04-01 16:34:51 -07:00
Jeff Brown
884f344137
Merge "Fix dispatcher crash when input monitoring enabled. Also ensure that we actually log assertion failures."
2011-04-01 16:33:40 -07:00
Scott Main
304fa07898
am 03d4dc3b: am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit '03d4dc3b75c28ee3f502c983fcb8304d556db063':
docs: update homepage announcement for Google IO
2011-04-01 16:27:19 -07:00
Scott Main
753fdd692d
am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit '0fa1d66cccc6041bcc55cf39e77970edbe89109f':
docs: update homepage announcement for Google IO
2011-04-01 16:25:14 -07:00
Scott Main
60d4f1268e
am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit '6261861a94448e4fbc26e313ce1410a184a10914':
docs: update homepage announcement for Google IO
2011-04-01 16:22:35 -07:00
Scott Main
59a50e129b
am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
...
* commit 'cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO
2011-04-01 16:19:30 -07:00
Scott Main
ac8b122389
Merge "docs: update homepage announcement for Google IO" into honeycomb
2011-04-01 16:17:40 -07:00
Jeff Brown
23e0c8c1a1
Fix dispatcher crash when input monitoring enabled.
...
Also ensure that we actually log assertion failures.
Bug: 4203092
Change-Id: I5c14bc41b2255f876858121f5572e2de75cabcc3
2011-04-01 16:15:13 -07:00
Mathias Agopian
27fd410be4
Merge "SurfaceTexture can now force the client to request a buffer"
2011-04-01 14:58:43 -07:00
Mathias Agopian
bf59b168f4
Merge "ANativeWindow_setBuffersGeometry now returns proper error codes"
2011-04-01 14:45:34 -07:00
Mathias Agopian
a5c75c0162
SurfaceTexture can now force the client to request a buffer
...
SurfaceTexture now has the concept of default size a new method,
setDefaultBufferSize() to set it. When the default size is
changed, dequeueBuffer() will return a value telling the
client that it must ask for a new buffer.
The above only applies if the client has not
overriden the buffer size with setGeometry.
Change-Id: I520dc40363054b7e37fdb67d6a2e7bce70326e81
2011-04-01 14:43:35 -07:00
Chet Haase
b629948766
Merge "Fix the build - change a reference to a namespace specification"
2011-04-01 14:34:16 -07:00
James Dong
ade41d686a
Merge "ISurfaceTexture does not have a method getIdentity()"
2011-04-01 14:06:56 -07:00
Andreas Huber
6335a33034
Merge "Remove legacy hack to only drop frames every other late frame"
2011-04-01 14:02:06 -07:00
Andreas Huber
37a0c7f20f
Merge "Fix a webm-seek issue introduced when adding support for streaming webm"
2011-04-01 14:01:09 -07:00