Eric Laurent
693ef00d54
Merge "Fix issue 4111672: AudioTrack control block flags"
2011-03-18 14:43:41 -07:00
Romain Guy
bce3a5f51b
Merge "Optimize rect-shaped layers."
2011-03-18 14:37:48 -07:00
James Dong
2f7c3607cf
Merge "Handle display dimension scaling event due to SAR embedded in AVC videos"
2011-03-18 13:45:37 -07:00
Andreas Huber
c9a8a8ce66
Merge "Signal a runtime error if the AVCDecoder encounters an invalid frame."
2011-03-18 13:22:25 -07:00
Dianne Hackborn
88d84f82c2
Merge "More work on making prefs work well on small screens."
2011-03-18 12:55:46 -07:00
Daisuke Miyakawa
b69f99defe
am f15b3db3: am 10221a22: am b02d3956: am e16a1bfa: Use system locale list.
...
* commit 'f15b3db3eb69683d23f379697cf86f8487845847':
Use system locale list.
2011-03-18 11:31:10 -07:00
Daisuke Miyakawa
3f7e2b5179
am 10221a22: am b02d3956: am e16a1bfa: Use system locale list.
...
* commit '10221a22ddb8f9ffaed52dfb4e0e30bc9d2f75b0':
Use system locale list.
2011-03-18 11:29:04 -07:00
Daisuke Miyakawa
bf4b3f73ce
am b02d3956: am e16a1bfa: Use system locale list.
...
* commit 'b02d395650a9a5fb13812cefa0ada1501f5b6d62':
Use system locale list.
2011-03-18 11:27:22 -07:00
Derek Sollenberger
c82c5b0bb3
am 0c8e22b1: am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '0c8e22b1d3dbcd4580db2a288af65fcca10cde1b':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:27:12 -07:00
shailendra
ff6b2fcc9e
am e21bbd24: am a5eaf2ea: am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit 'e21bbd24a107c3286e8c6f3eca069ebb12ef13da':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:27:09 -07:00
Derek Sollenberger
d338153e97
am 25dad8ed: am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '25dad8eda13d70a2473cde735042d083a578fb48':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:23:51 -07:00
shailendra
6f4012bb83
am a5eaf2ea: am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit 'a5eaf2eae0d11c45d9167f7fcadaafdeefad645c':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:23:47 -07:00
Daisuke Miyakawa
48a27defe9
am e16a1bfa: Use system locale list.
...
* commit 'e16a1bfa9cd9a9a0430e2fe890586ae451f0faaf':
Use system locale list.
2011-03-18 11:23:00 -07:00
Derek Sollenberger
529f878975
am 5750bb7d: Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
...
* commit '5750bb7d8f59c0f8e18baaa60bcb492c867db590':
Prevent intermediate scale updates from being sent to WebKit while zooming.
2011-03-18 11:02:45 -07:00
shailendra
e6fb416547
am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
...
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
2011-03-18 11:02:35 -07:00
Derek Sollenberger
800094d7d1
Merge "Prevent intermediate scale updates from being sent to WebKit while zooming." into honeycomb-mr1
2011-03-18 10:57:46 -07:00
shailendra
886c92028f
Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
2011-03-18 09:35:37 -07:00
Valentin Kravtsov
c211c766be
am d35f9390: am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit 'd35f939010cb889d0e5d757f2e3f76c5b50b419a':
Fixing a race condition in RecognitionService
2011-03-18 09:27:56 -07:00
Valentin Kravtsov
9f198e5598
am 000466d7: am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit '000466d79d33fa302c6c8d20d2db45faca7c31e0':
Fixing a race condition in RecognitionService
2011-03-18 09:15:49 -07:00
Valentin Kravtsov
a06b350e55
am 125be9c8: Merge "Fixing a race condition in RecognitionService" into gingerbread
...
* commit '125be9c85a3bf71add2841d4195905c1e681a83e':
Fixing a race condition in RecognitionService
2011-03-18 09:04:33 -07:00
Valentin Kravtsov
16f5cc4c58
Merge "Fixing a race condition in RecognitionService" into gingerbread
2011-03-18 08:49:51 -07:00
Jeff Brown
f98f1364f8
Merge "Refactor how timeouts are calculated."
2011-03-17 20:16:42 -07:00
Dianne Hackborn
e5e02aac29
am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:07:17 -07:00
Dianne Hackborn
5d1e292b88
am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:05:08 -07:00
Dianne Hackborn
1828fd2a08
am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
...
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
Whoops, forgot the HONEYCOMB_MR1 constant. :(
2011-03-17 19:02:15 -07:00
Dianne Hackborn
f9a31086ee
Merge "AsyncTask now uses the poll executor for apps up through HC MR1 and the serialized one after that."
2011-03-17 19:02:11 -07:00
Dianne Hackborn
acf8cb2596
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
2011-03-17 19:00:56 -07:00
Huahui Wu
381e05df74
am f5cf85d0: am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'f5cf85d07c99ae834d1b58bf5109982f9a4f3604':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:47:21 -07:00
Jason Sams
a1dc4b24a8
Merge "Migrate thread launch to driver."
2011-03-17 18:20:09 -07:00
Jason Sams
1d76718196
Merge "Start seperating out RS compute implementation. Create hal layer to seperate from runtime."
2011-03-17 18:19:56 -07:00
Huahui Wu
f495884211
am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'd1e89c412ff10345cd217ae3d1bb1e780d56dbaa':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:13:16 -07:00
Huahui Wu
1b3437371d
am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
...
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
b/4116658 Fix the jumpy scrolling with some flash site.
2011-03-17 18:11:04 -07:00
Huahui Wu
f6fb4ed1dc
Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1
2011-03-17 18:09:33 -07:00
Wink Saville
43e8369b56
am d2cc7d55: am 94191d43: am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
...
* commit 'd2cc7d5543bf39e9caa444efc44e74d5ae2188a5':
Change stopship to todo.
2011-03-17 18:07:22 -07:00
Justin Ho
4959d3b06a
am 93b1a4dd: am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit '93b1a4dd97574da7de2f6c589d5c84f91829cd9a':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 18:06:55 -07:00
James Dong
02cc7170a2
am 14438b81: am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit '14438b81a1fe4d7ebdf8977f3d80a1dd1867c5ad':
Fix missing AOSP copyright headers for more files
2011-03-17 18:06:51 -07:00
Wink Saville
e0f42f3fe9
am 94191d43: am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
...
* commit '94191d43491a38305ca17456a9b806e58fbda99d':
Change stopship to todo.
2011-03-17 18:03:53 -07:00
Wink Saville
c57bb62954
am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1
...
* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
Change stopship to todo.
2011-03-17 18:00:55 -07:00
Justin Ho
b083a15e62
am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit 'dd8f9268415de539b9b17a9b7d24405b50d9c053':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 18:00:23 -07:00
James Dong
4164973cf1
am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit '970bad677585b3cba1ff1b48db9040c2005bd907':
Fix missing AOSP copyright headers for more files
2011-03-17 18:00:19 -07:00
Wink Saville
b77b4807d0
Merge "Change stopship to todo." into honeycomb-mr1
2011-03-17 17:58:06 -07:00
Justin Ho
8ca8908e0f
am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
...
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
2011-03-17 17:55:58 -07:00
James Dong
0db849a855
am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
Fix missing AOSP copyright headers for more files
2011-03-17 17:55:48 -07:00
Eric Fischer
de06b0e350
Merge "Import revised translations."
2011-03-17 17:32:50 -07:00
Jeff Brown
c0a5e8df03
Refactor how timeouts are calculated.
...
Added a timeout mechanism to EventHub and InputReader so that
InputMappers can request timeouts to perform delayed processing of
input when needed.
Change-Id: Iec2045baaf4e67690b15eef3c09a58d5cac76897
2011-03-17 17:29:09 -07:00
Justin Ho
c14e692d62
Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1
2011-03-17 16:49:32 -07:00
Xia Wang
cb22be3ba8
am 74f1b609: (-s ours) am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
...
* commit '74f1b609510c942b2e56b045a6685f5a6d53ccce':
Port wi-fi stress test into GB DO NOT MERGE
2011-03-17 16:27:45 -07:00
Xavier Ducrohet
23d088139d
am 68957a0d: (-s ours) am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
...
* commit '68957a0d7516c82b8cb4050f15294c663bf08338':
Merge 67450db0 from honeycomb. Do not merge.
2011-03-17 16:27:42 -07:00
Mike Lockwood
158b7f0fba
am f63113d1: am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot.
...
* commit 'f63113d158b2afd98b41735ec02c8e800a73d23e':
GPS: Restore XTRA downloading at boot.
2011-03-17 16:27:39 -07:00
Simon Wilson
430e80091e
am 0620ebd7: (-s ours) am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
...
* commit '0620ebd7c47d79e95ed1048abd4317aa136bc0dd':
DO NOT MERGE Add images to ERI icon list
2011-03-17 16:27:36 -07:00