Jamie Gennis
09bb22afae
am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
SurfaceFlinger: Fix a typo.
2011-03-18 17:36:51 -07:00
Jamie Gennis
560fe009e5
am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
...
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
SurfaceFlinger: Fix a typo.
2011-03-18 17:34:27 -07:00
Jamie Gennis
d32a694a0c
Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1
2011-03-18 17:32:25 -07:00
Eric Fischer
0c8f2bd227
am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '9ac8260608224f182ac5a20e50ce4352334a09ba':
Import revised translations. DO NOT MERGE
2011-03-18 16:53:45 -07:00
Jamie Gennis
5fd799dab6
SurfaceFlinger: Fix a typo.
...
This change makes Layer skip its cleanup of its old shared memory region
when the UserClient object that owned the memory has been freed.
Bug: 3429357
Change-Id: I9e4d8eb190f6914dc043674b9bb8dd28e959901b
2011-03-18 16:35:13 -07:00
Eric Fischer
eefe09b7df
am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit 'c0604255a71c0b7114c3f011519160d4812a8100':
Import revised translations. DO NOT MERGE
2011-03-18 16:06:41 -07:00
Russell Brenner
dee4e7fab1
am e68dc157: am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit 'e68dc1576f2a27de17da41129778df331cda1f3f':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:34:49 -07:00
Russell Brenner
bd7b09f841
am a0dc8da2: Merge "DO NOT MERGE Send WebView the current transform and whether we\'re drawing a layer. Bug #3275491 " into honeycomb-mr1
...
* commit 'a0dc8da2ab0a084432c7094e434b7957dd2eaf5c':
DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491
2011-03-18 15:32:18 -07:00
Russell Brenner
b36926abde
Merge "DO NOT MERGE Send WebView the current transform and whether we're drawing a layer. Bug #3275491 " into honeycomb-mr1
2011-03-18 15:28:27 -07:00
Teng-Hui Zhu
f5c2f676e6
am eb52fb32: am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit 'eb52fb32297219efbd6add01586f06f32b260c58':
Asset for video poster
2011-03-18 15:27:22 -07:00
Eric Fischer
d2cd24d8ce
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2011-03-18 15:22:05 -07:00
Teng-Hui Zhu
3b9b781405
am 7eaf4831: Merge "Asset for video poster" into honeycomb-mr1
...
* commit '7eaf483140f1c42f29c7cde71061521280b253ce':
Asset for video poster
2011-03-18 15:22:03 -07:00
Teng-Hui Zhu
c53cb0d36c
Merge "Asset for video poster" into honeycomb-mr1
2011-03-18 15:19:28 -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
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
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
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
acf8cb2596
Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1
2011-03-17 19:00: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
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
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
08b5f02649
am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
...
* commit '01a111486d06c21ddb723195c177c8991d5db151':
Port wi-fi stress test into GB DO NOT MERGE
2011-03-17 16:25:09 -07:00
Xavier Ducrohet
72551f34af
am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
...
* commit '3a90ec4e6b4973f56dae825c967bbee69e6239cf':
Merge 67450db0 from honeycomb. Do not merge.
2011-03-17 16:25:07 -07:00
Mike Lockwood
5f9fd46d00
am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot.
...
* commit 'a5b68f39e2936a83eac0b995992724cd5de6905d':
GPS: Restore XTRA downloading at boot.
2011-03-17 16:25:01 -07:00
Simon Wilson
f819b0bc4c
am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
...
* commit '3fa3721e8f771a6edc8acdd21f567af93ddea7e1':
DO NOT MERGE Add images to ERI icon list
2011-03-17 16:24:58 -07:00
Mike Lockwood
9f22e65f80
am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
...
* commit 'af64e751e2373790dd661be80b11a03332712e90':
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
2011-03-17 16:24:53 -07:00
Xia Wang
601cf70eb9
am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread
...
* commit 'e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
Port wi-fi stress test into GB DO NOT MERGE
2011-03-17 16:21:28 -07:00
Xavier Ducrohet
c8f07bae1f
am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
...
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
Merge 67450db0 from honeycomb. Do not merge.
2011-03-17 16:21:20 -07:00
Mike Lockwood
6dd337b9f1
am 5982bf66: GPS: Restore XTRA downloading at boot.
...
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
GPS: Restore XTRA downloading at boot.
2011-03-17 16:20:56 -07:00
Simon Wilson
41c48eef34
am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread
...
* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
DO NOT MERGE Add images to ERI icon list
2011-03-17 16:20:46 -07:00
Mike Lockwood
2ce416b5d2
am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
...
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
DO NOT MERGE: Improve message for the "no app for USB accessory" dialog.
2011-03-17 16:20:32 -07:00
James Dong
29c6574d45
Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
2011-03-17 16:11:13 -07:00