git.osdn.net Git - android-x86/frameworks-native.git/log

Daniel Sandler [Tue, 15 Mar 2011 01:24:42 +0000 (18:24 -0700)]

am 9bbaa156: (-s ours) am 45660662: Merge "Workaround unknown ERI indices." into gingerbread

* commit '9bbaa1564b81e97d3c26ad603a0d67789f275ed5':
Workaround unknown ERI indices.

commit | commitdiff | tree

Romain Guy [Tue, 15 Mar 2011 01:18:03 +0000 (18:18 -0700)]

am ee7ace06: Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1

* commit 'ee7ace065f77b53a57cb6273b9f2f5d85caba90c':
Fix rendering artifact in edge fades. Bug #4092053

commit | commitdiff | tree

Romain Guy [Tue, 15 Mar 2011 01:16:39 +0000 (18:16 -0700)]

Merge "Fix rendering artifact in edge fades. Bug #4092053" into honeycomb-mr1

commit | commitdiff | tree

Dirk Dougherty [Tue, 15 Mar 2011 00:52:31 +0000 (17:52 -0700)]

am a5732aa2: am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb

* commit 'a5732aa275273edf9ae91340a440b3f2cd47c682':
Doc change: updated home tab announce post-GDC

commit | commitdiff | tree

Dirk Dougherty [Tue, 15 Mar 2011 00:50:06 +0000 (17:50 -0700)]

am 2f1d2ce1: Merge "Doc change: updated home tab announce post-GDC" into honeycomb

* commit '2f1d2ce1f2d58f959adaf8ce514d39970210331a':
Doc change: updated home tab announce post-GDC

commit | commitdiff | tree

Jamie Gennis [Tue, 15 Mar 2011 00:49:15 +0000 (17:49 -0700)]

am 1a0452b7: am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1

* commit '1a0452b715727579a2a4408092f51f751c12f777':
SurfaceTexture: fix transform matrix computation.

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:49:13 +0000 (17:49 -0700)]

am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1

* commit '38bc9f0701150e089dd624bb30ac286637b5c2b9':
Fix broadcast receiver leak in UsbConfirmActivity

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:49:02 +0000 (17:49 -0700)]

am 5da789a6: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit '5da789a6735a9e06e6cd6b72b09c7de9bf7715a8':

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:48:57 +0000 (17:48 -0700)]

am 8f455b2e: Add support for USB accessory serial numbers

* commit '8f455b2e265f95ba5ea5b14009a91148a5b072b4':
Add support for USB accessory serial numbers

commit | commitdiff | tree

Jamie Gennis [Tue, 15 Mar 2011 00:45:38 +0000 (17:45 -0700)]

am 122dd099: Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1

* commit '122dd0999f09eedbe42e619b64276633bea60e6a':
SurfaceTexture: fix transform matrix computation.

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:45:29 +0000 (17:45 -0700)]

am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1

* commit 'f4c9c140a204c83c6185b9ada0e33e740ecf779b':
Fix broadcast receiver leak in UsbConfirmActivity

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:45:28 +0000 (17:45 -0700)]

Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

commit | commitdiff | tree

Dirk Dougherty [Tue, 15 Mar 2011 00:44:28 +0000 (17:44 -0700)]

Merge "Doc change: updated home tab announce post-GDC" into honeycomb

commit | commitdiff | tree

Jamie Gennis [Tue, 15 Mar 2011 00:42:48 +0000 (17:42 -0700)]

Merge "SurfaceTexture: fix transform matrix computation." into honeycomb-mr1

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:42:04 +0000 (17:42 -0700)]

Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:41:22 +0000 (17:41 -0700)]

am 221830b9: Merge "Add support for USB accessory serial numbers" into honeycomb-mr1

* commit '221830b93d6f35bcf20db2d34978392b43f44221':
Add support for USB accessory serial numbers

commit | commitdiff | tree

Mike Lockwood [Tue, 15 Mar 2011 00:39:43 +0000 (17:39 -0700)]

Merge "Add support for USB accessory serial numbers" into honeycomb-mr1

commit | commitdiff | tree

Shailendra Yadav [Tue, 15 Mar 2011 00:36:56 +0000 (17:36 -0700)]

am 3fabad87: Merge "Fix for Don\'t allow adding 64-bit files(4086708)" into honeycomb-mr1

* commit '3fabad87f6cade6ccf7dc6d716e8b91675982088':
Fix for Don't allow adding 64-bit files(4086708)

commit | commitdiff | tree

Gloria Wang [Tue, 15 Mar 2011 00:36:42 +0000 (17:36 -0700)]

am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1

* commit '132bb659b643348f29292810e42800441df41ceb':
For issue 4082089 Add more info and error events into the DRM framework

commit | commitdiff | tree

Shailendra Yadav [Tue, 15 Mar 2011 00:23:05 +0000 (17:23 -0700)]

Merge "Fix for Don't allow adding 64-bit files(4086708)" into honeycomb-mr1

commit | commitdiff | tree

Gloria Wang [Tue, 15 Mar 2011 00:02:58 +0000 (17:02 -0700)]

Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1

commit | commitdiff | tree

Scott Main [Tue, 15 Mar 2011 00:02:34 +0000 (17:02 -0700)]

am 9f3f36c9: am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb

* commit '9f3f36c95b87aab2c5f7cd6b6e18927f8ebfa9c4':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc

commit | commitdiff | tree

Scott Main [Tue, 15 Mar 2011 00:02:31 +0000 (17:02 -0700)]

am 04e1af80: am 7b013bb5: docs: release notes for ADT 10.0.1

* commit '04e1af802abfcecda2b86f1a3082a5c806026beb':
docs: release notes for ADT 10.0.1

commit | commitdiff | tree

Scott Main [Mon, 14 Mar 2011 23:42:28 +0000 (16:42 -0700)]

am c2366c89: Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb

* commit 'c2366c898abacb4b6e3723f6cad522615a2b304e':
docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc

commit | commitdiff | tree

Scott Main [Mon, 14 Mar 2011 23:42:17 +0000 (16:42 -0700)]

am 7b013bb5: docs: release notes for ADT 10.0.1

* commit '7b013bb579a9bc372b30e2e520f6e200f6c2b1b9':
docs: release notes for ADT 10.0.1

commit | commitdiff | tree

Scott Main [Mon, 14 Mar 2011 23:08:09 +0000 (16:08 -0700)]

Merge "docs: update optimization guide with more info most importantly, information about using <compatible-screens> also add sample code to <compatible-screens> doc" into honeycomb

commit | commitdiff | tree

Nicolas Roard [Mon, 14 Mar 2011 22:39:37 +0000 (15:39 -0700)]

am 65c28204: Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1

* commit '65c282042dab1dfa75b10517190ba38834782c3b':
Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)

commit | commitdiff | tree

Xavier Ducrohet [Mon, 14 Mar 2011 22:29:13 +0000 (15:29 -0700)]

am 7608181c: am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1

* commit '7608181ca76eda1ab64661ddae13bbb92e185ae8':
LayoutLib: Fix Arc rendering.

commit | commitdiff | tree

Neel Parekh [Mon, 14 Mar 2011 22:29:06 +0000 (15:29 -0700)]

am 5b3d18cf: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit '5b3d18cfa2879e47a4d9c06024b81c63c48e41f1':

commit | commitdiff | tree

Nicolas Roard [Mon, 14 Mar 2011 22:29:00 +0000 (15:29 -0700)]

am f146fd9c: Adding placeholders for the fullscreen button used by the browser for HTML5 video

* commit 'f146fd9c2122ac27bc1a70c16864899c94371923':
Adding placeholders for the fullscreen button used by the browser for HTML5 video

commit | commitdiff | tree

Nicolas Roard [Mon, 14 Mar 2011 22:26:58 +0000 (15:26 -0700)]

Merge "Adding placeholders for the large play button used by the browser for HTML5 video (the button will appear surimposed to the video)" into honeycomb-mr1

commit | commitdiff | tree

Xavier Ducrohet [Mon, 14 Mar 2011 22:25:45 +0000 (15:25 -0700)]

am 491ef0c6: Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1

* commit '491ef0c6bdaa45201278813bdfbf859801aba655':
LayoutLib: Fix Arc rendering.

commit | commitdiff | tree

Neel Parekh [Mon, 14 Mar 2011 22:25:44 +0000 (15:25 -0700)]

Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

commit | commitdiff | tree

Nicolas Roard [Mon, 14 Mar 2011 22:24:57 +0000 (15:24 -0700)]

am b6866f81: am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1

* commit 'b6866f81a945d57390542526b154edae01ee795e':
Adding placeholders for the fullscreen button used by the browser for HTML5 video

commit | commitdiff | tree

Renaud-Roland Hubert [Mon, 14 Mar 2011 22:24:54 +0000 (15:24 -0700)]

am 58162eba: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit '58162eba33c287d747ceb4753abf6c3ba4223466':

commit | commitdiff | tree

Jamie Gennis [Mon, 14 Mar 2011 22:24:51 +0000 (15:24 -0700)]

am 21752785: gl2_yuvtex: use the gralloc-provided stride.

* commit '21752785bae7c1beaf5729e43973bed6b9e14520':
gl2_yuvtex: use the gralloc-provided stride.

commit | commitdiff | tree

Xavier Ducrohet [Mon, 14 Mar 2011 22:24:20 +0000 (15:24 -0700)]

Merge "LayoutLib: Fix Arc rendering." into honeycomb-mr1

commit | commitdiff | tree

Jamie Gennis [Mon, 14 Mar 2011 22:22:34 +0000 (15:22 -0700)]

am c313b59b: am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1

* commit 'c313b59b4295c7cfe7f13d635be2c85f9fee7365':
gl2_yuvtex: use the gralloc-provided stride.

commit | commitdiff | tree

James Wilson [Mon, 14 Mar 2011 22:22:31 +0000 (15:22 -0700)]

am 5efa65d1: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit '5efa65d1948c3396d4f68a64c9fe4788a4ab0d62':

commit | commitdiff | tree

Huahui Wu [Mon, 14 Mar 2011 22:22:29 +0000 (15:22 -0700)]

am cc8fa160: b/3392594 keep the remain touch points when one is ended.

* commit 'cc8fa160fbfcd17f369c15a2d33959fbb090ac6e':
b/3392594 keep the remain touch points when one is ended.

commit | commitdiff | tree

Nicolas Roard [Mon, 14 Mar 2011 22:21:46 +0000 (15:21 -0700)]

am 0fd8fa33: Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1

* commit '0fd8fa33e28df28568532c30f53a91a8d652b35d':
Adding placeholders for the fullscreen button used by the browser for HTML5 video

commit | commitdiff | tree

Renaud-Roland Hubert [Mon, 14 Mar 2011 22:21:44 +0000 (15:21 -0700)]

Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

commit | commitdiff | tree

Jamie Gennis [Thu, 10 Mar 2011 22:49:00 +0000 (14:49 -0800)]

gl2_yuvtex: use the gralloc-provided stride.

This change fixes the gl2_yuvtex test to use the stride chosen by the
gralloc implementation rather than hard-coding it.

Bug: 4081948
Change-Id: If7c96a20fc3fb1df2ff25e6afaa9f34dbad2002c

commit | commitdiff | tree

Jamie Gennis [Mon, 14 Mar 2011 22:19:31 +0000 (15:19 -0700)]

am 071929b2: Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1

* commit '071929b202404da110c17fad4aba216558e7e785':
gl2_yuvtex: use the gralloc-provided stride.

commit | commitdiff | tree

James Wilson [Mon, 14 Mar 2011 22:19:30 +0000 (15:19 -0700)]

Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

commit | commitdiff | tree

Huahui Wu [Mon, 14 Mar 2011 22:15:16 +0000 (15:15 -0700)]

am 9691d3f3: am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1

* commit '9691d3f3181e514471383e170684b27330cb5dbb':
b/3392594 keep the remain touch points when one is ended.

commit | commitdiff | tree

Huahui Wu [Mon, 14 Mar 2011 22:15:04 +0000 (15:15 -0700)]

am f2a9e576: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit 'f2a9e576d4fb5d028d1acf7344d611c91bb40999':

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 22:14:59 +0000 (15:14 -0700)]

am d5e8dae8: Import revised translations. DO NOT MERGE

* commit 'd5e8dae883f8343e7adfb1f4388d742002e5eb8e':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Scott Main [Mon, 14 Mar 2011 22:14:36 +0000 (15:14 -0700)]

am c899d32e: docs: update search dev guide with SearcView widget

* commit 'c899d32e8be988b46c37206827a0a1a7a4b809a6':
docs: update search dev guide with SearcView widget

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 22:14:22 +0000 (15:14 -0700)]

am e0b33ce0: Add "new incognito window" translations.

* commit 'e0b33ce0c3ebdb7aa73af5350bb5bdcd26f59370':
Add "new incognito window" translations.

commit | commitdiff | tree

Nicolas Roard [Mon, 14 Mar 2011 22:11:55 +0000 (15:11 -0700)]

Merge "Adding placeholders for the fullscreen button used by the browser for HTML5 video" into honeycomb-mr1

commit | commitdiff | tree

Scott Main [Mon, 14 Mar 2011 21:59:11 +0000 (14:59 -0700)]

am 2213a4ac: am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget

* commit '2213a4aca030151f6590a998200daa9865202343':
docs: update search dev guide with SearcView widget

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:58:50 +0000 (14:58 -0700)]

am 95176382: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

* commit '951763824168d08d3f54ba22917756d769486b8b':

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:58:45 +0000 (14:58 -0700)]

am 9f7b4ba6: Import revised translations. DO NOT MERGE

* commit '9f7b4ba69ca809d6909b8863d3570f970edcb7bf':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:58:39 +0000 (14:58 -0700)]

am aa3ea7be: Add "new incognito window" translations.

* commit 'aa3ea7be0c78e8aa5f3a32b0decba03edba00686':
Add "new incognito window" translations.

commit | commitdiff | tree

Jamie Gennis [Mon, 14 Mar 2011 21:49:37 +0000 (14:49 -0700)]

Merge "gl2_yuvtex: use the gralloc-provided stride." into honeycomb-mr1

commit | commitdiff | tree

Huahui Wu [Mon, 14 Mar 2011 21:46:27 +0000 (14:46 -0700)]

am b71020ef: Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1

* commit 'b71020ef4018195a21d2538ea3767b901610daf4':
b/3392594 keep the remain touch points when one is ended.

commit | commitdiff | tree

Huahui Wu [Mon, 14 Mar 2011 21:46:26 +0000 (14:46 -0700)]

Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

commit | commitdiff | tree

Huahui Wu [Mon, 14 Mar 2011 21:43:46 +0000 (14:43 -0700)]

Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1

commit | commitdiff | tree

Scott Main [Mon, 14 Mar 2011 21:42:51 +0000 (14:42 -0700)]

am 462012db: am abdf0d53: docs: update search dev guide with SearcView widget

* commit '462012db70fb73431bb25909d73e45fea9fc5911':
docs: update search dev guide with SearcView widget

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:42:50 +0000 (14:42 -0700)]

Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE

commit | commitdiff | tree

Scott Main [Mon, 14 Mar 2011 21:36:56 +0000 (14:36 -0700)]

am abdf0d53: docs: update search dev guide with SearcView widget

* commit 'abdf0d533c292709e51cee2c1213d5e44baca963':
docs: update search dev guide with SearcView widget

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:29:05 +0000 (14:29 -0700)]

am 175121a5: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit '175121a513f4cea91d7950d6b3978383d3b2a352':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:28:58 +0000 (14:28 -0700)]

am 9f70f526: Merge "Add "new incognito window" translations." into honeycomb-mr1

* commit '9f70f5268fac9c2dd5ed4cb9582da5931c846a91':
Add "new incognito window" translations.

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:17:01 +0000 (14:17 -0700)]

Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

commit | commitdiff | tree

Eric Fischer [Mon, 14 Mar 2011 21:13:29 +0000 (14:13 -0700)]

Merge "Add "new incognito window" translations." into honeycomb-mr1

commit | commitdiff | tree

Ramesh Sudini [Mon, 14 Mar 2011 20:49:36 +0000 (13:49 -0700)]

am e62dee25: Do not merge: Telephony: Rename lte_on_cdma property.

* commit 'e62dee25e50c04c235cd37df66e4ef123b761663':
Do not merge: Telephony: Rename lte_on_cdma property.

commit | commitdiff | tree

Ramesh Sudini [Mon, 14 Mar 2011 20:47:48 +0000 (13:47 -0700)]

am f5727615: Do not merge: Telephony: Corrections to LTE and eHRPD constant values.

* commit 'f57276154aaa587524374db8e0d7228383611bf3':
Do not merge: Telephony: Corrections to LTE and eHRPD constant values.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:47:44 +0000 (13:47 -0700)]

am f90c2609: Do not merge: Add outputting "on" or "off" setRadioPower.

* commit 'f90c26090402a517aa68cade7f452bc1ad85e654':
Do not merge: Add outputting "on" or "off" setRadioPower.

commit | commitdiff | tree

Ramesh Sudini [Mon, 14 Mar 2011 20:47:42 +0000 (13:47 -0700)]

am c06c5c1a: Do not merge: Telephony: Fix config to reflect the correct CM conn type.

* commit 'c06c5c1a13da26c8435f2d4b72a41a38e1d463b8':
Do not merge: Telephony: Fix config to reflect the correct CM conn type.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:47:39 +0000 (13:47 -0700)]

am 124e2872: Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.

* commit '124e28728b16cb63c700a323b9dfb1348580c896':
Do not merge: Have createAllDataConnectionList create the RetryManager inside the loop.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:47:36 +0000 (13:47 -0700)]

am 321b730a: Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.

* commit '321b730a9d34b237c26075d963c8febf8d62eff1':
Do not merge: Remove mRetryMgr and directly use DataConnection retry mgr.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:44:50 +0000 (13:44 -0700)]

am d6398ad3: Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE

* commit 'd6398ad3ce962a6345d18b166ae8484a4259f6f2':
Do not merge: Fix 3G connectivity bug 3513741.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:44:48 +0000 (13:44 -0700)]

am 08d79acc: Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE

* commit '08d79acc462a395a6fb6d0b126eb4d97466962c7':
Do not merge: RIL: Merge Issue. LTE SIM additions.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:44:45 +0000 (13:44 -0700)]

am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE

* commit '7fbae1d23c99383d0dbaa1be35a41246934e3ce4':
Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:44:43 +0000 (13:44 -0700)]

am 16b7f051: Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE

* commit '16b7f051f71e276f4dd45455e92c33a0894bab10':
Do not merge: LTE: Fix SST for CDMALTEPhone.

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:44:40 +0000 (13:44 -0700)]

am 9e22c33c: Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE

* commit '9e22c33c2b6ff5c9a45ebac88d048f6f61557e82':
Do not merge: Clean up LTE code change

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:44:37 +0000 (13:44 -0700)]

am c3853f36: Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE

* commit 'c3853f36645f2f4f4801d6465e82095cf38ea043':
Do not merge: Add some input checking to prevent problems

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:43:05 +0000 (13:43 -0700)]

Merge "Do not merge: Fix 3G connectivity bug 3513741." into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:42:50 +0000 (13:42 -0700)]

am c15cf635: Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE

* commit 'c15cf6353ee1c1cae83039a19fb8d5e5c7d76804':
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:42:49 +0000 (13:42 -0700)]

Merge "Do not merge: RIL: Merge Issue. LTE SIM additions." into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:42:24 +0000 (13:42 -0700)]

Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:42:07 +0000 (13:42 -0700)]

Merge "Do not merge: LTE: Fix SST for CDMALTEPhone." into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:41:42 +0000 (13:41 -0700)]

Merge "Do not merge: Clean up LTE code change" into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:41:26 +0000 (13:41 -0700)]

Merge "Do not merge: Add some input checking to prevent problems" into honeycomb-LTE

commit | commitdiff | tree

Gilles Debunne [Mon, 14 Mar 2011 20:41:14 +0000 (13:41 -0700)]

am 816dd3d4: (-s ours) resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp

* commit '816dd3d443108b473965f97123eef7300f53615f':
Double tap on a word no longer opens context menu. DO NOT MERGE

commit | commitdiff | tree

Wink Saville [Mon, 14 Mar 2011 20:40:57 +0000 (13:40 -0700)]

Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE

commit | commitdiff | tree

Daniel Sandler [Mon, 14 Mar 2011 20:34:08 +0000 (13:34 -0700)]

am 45660662: Merge "Workaround unknown ERI indices." into gingerbread

* commit '45660662e61e8cc3ff13144668767a86d1d5b7f4':
Workaround unknown ERI indices.

commit | commitdiff | tree

Gilles Debunne [Mon, 14 Mar 2011 19:57:01 +0000 (12:57 -0700)]

resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp

Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da

commit | commitdiff | tree

Irfan Sheriff [Mon, 14 Mar 2011 18:56:03 +0000 (11:56 -0700)]

am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1

* commit '9b1ea0bd2c9af64c424fa4fef327108cb376b74f':
Backup and restore IP and proxy settings

commit | commitdiff | tree

Irfan Sheriff [Mon, 14 Mar 2011 18:50:38 +0000 (11:50 -0700)]

am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1

* commit 'e21110f8b1e4aa884f7a4e2164ae90dab8d5f3fa':
Backup and restore IP and proxy settings

commit | commitdiff | tree

Kenny Root [Mon, 14 Mar 2011 18:49:56 +0000 (11:49 -0700)]

am 206c62ed: am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"

* commit '206c62ed34dc8a48fd6c907d95456226949f42dd':
Remove unnecessary SkImageDecoder_libjpeg.cpp

commit | commitdiff | tree

Irfan Sheriff [Mon, 14 Mar 2011 18:48:35 +0000 (11:48 -0700)]

Merge "Backup and restore IP and proxy settings" into honeycomb-mr1

commit | commitdiff | tree

Daniel Sandler [Mon, 14 Mar 2011 18:37:12 +0000 (11:37 -0700)]

Merge "Workaround unknown ERI indices." into gingerbread

commit | commitdiff | tree

Gilles Debunne [Mon, 14 Mar 2011 18:30:17 +0000 (11:30 -0700)]

Merge "Double tap on a word no longer opens context menu. DO NOT MERGE" into gingerbread

commit | commitdiff | tree

Jamie Gennis [Fri, 11 Mar 2011 00:24:46 +0000 (16:24 -0800)]

SurfaceTexture: fix transform matrix computation.

This change fixes the transform matrix computation in SurfaceTexture
when a crop rectangle is specified by the image producer. It also adds
a test for this case as well as a basic test for the uncropped case.

Bug: 4070775
Change-Id: I1481c9ce9d08fe7f2bff86d3afdeab7d4002b157

commit | commitdiff | tree

Jamie Gennis [Thu, 10 Mar 2011 22:49:00 +0000 (14:49 -0800)]

commit | commitdiff | tree

Gilles Debunne [Mon, 14 Mar 2011 18:27:54 +0000 (11:27 -0700)]

am 8503af84: Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1

* commit '8503af848657356411a9bb4cf15d798d4f15111b':
Paste popup uses a disabled icon when there is nothing to paste.

commit | commitdiff | tree

Gilles Debunne [Mon, 14 Mar 2011 18:26:36 +0000 (11:26 -0700)]

Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1

commit | commitdiff | tree

Eric Laurent [Mon, 14 Mar 2011 18:23:56 +0000 (11:23 -0700)]

am 3cbfd10b: Merge "Partial fix for issue 3515250: video chat and SCO" into honeycomb-mr1

* commit '3cbfd10bbb869f763880060ebe01dd66da62bbc3':
Partial fix for issue 3515250: video chat and SCO