OSDN Git Service

android-x86/frameworks-native.git
13 years agoMerge "Fix NPE."
Daniel Sandler [Wed, 16 Feb 2011 19:32:39 +0000 (11:32 -0800)]
Merge "Fix NPE."

13 years agoam 271397cf: (-s ours) am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE -...
Robert Greenwalt [Wed, 16 Feb 2011 18:58:34 +0000 (10:58 -0800)]
am 271397cf: (-s ours) am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit '271397cfb2b79d1346568209b37b1f57707f924a':
  DO NOT MERGE - backport of l92a02b31 from master

13 years agoam de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from...
Robert Greenwalt [Wed, 16 Feb 2011 18:55:54 +0000 (10:55 -0800)]
am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit 'de27b519588ed46c0ba601a489c01d26ec31757d':
  DO NOT MERGE - backport of l92a02b31 from master

13 years agoam 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Robert Greenwalt [Wed, 16 Feb 2011 18:51:04 +0000 (10:51 -0800)]
am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit '3259d8853760a72b811757e1711119d041962a1c':
  DO NOT MERGE - backport of l92a02b31 from master

13 years agoMerge "Code cleaning"
Fabrice Di Meglio [Wed, 16 Feb 2011 18:48:12 +0000 (10:48 -0800)]
Merge "Code cleaning"

13 years agoMerge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread
Robert Greenwalt [Wed, 16 Feb 2011 18:44:26 +0000 (10:44 -0800)]
Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

13 years agoam aebe3dfe: (-s ours) am 874ae43c: Merge "Import revised translations. DO NOT MERGE...
Eric Fischer [Wed, 16 Feb 2011 18:41:59 +0000 (10:41 -0800)]
am aebe3dfe: (-s ours) am 874ae43c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

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

13 years agoam 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Wed, 16 Feb 2011 18:38:11 +0000 (10:38 -0800)]
am 874ae43c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '874ae43ce1c7fc1fe6c1423b581757fe14edce6e':
  Import revised translations.  DO NOT MERGE

13 years agoMerge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Wed, 16 Feb 2011 18:33:18 +0000 (10:33 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into honeycomb

13 years agoam 2d314d12: (-s ours) am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE -...
Alon Albert [Wed, 16 Feb 2011 18:28:51 +0000 (10:28 -0800)]
am 2d314d12: (-s ours) am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

* commit '2d314d1282067518bcd34015f629c5d3e6ff15a1':
  DO NOT MERGE - Clear backoffs on reconnect

13 years agoam b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect...
Alon Albert [Wed, 16 Feb 2011 18:26:53 +0000 (10:26 -0800)]
am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

* commit 'b79db4cd5ccbe17e837c8943abb658bbf0dd0854':
  DO NOT MERGE - Clear backoffs on reconnect

13 years agoam 415ef50d: am 796ce77a: docs: add breadcrumbs to articles and tutorials
Scott Main [Wed, 16 Feb 2011 18:25:29 +0000 (10:25 -0800)]
am 415ef50d: am 796ce77a: docs: add breadcrumbs to articles and tutorials

* commit '415ef50d902dddfe974f3a280733ae3769931143':
  docs: add breadcrumbs to articles and tutorials

13 years agoam be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
Alon Albert [Wed, 16 Feb 2011 18:24:15 +0000 (10:24 -0800)]
am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

* commit 'be5f82ab0ddacea3846cfa5aa846d1c97def0318':
  DO NOT MERGE - Clear backoffs on reconnect

13 years agoam 796ce77a: docs: add breadcrumbs to articles and tutorials
Scott Main [Wed, 16 Feb 2011 18:23:05 +0000 (10:23 -0800)]
am 796ce77a: docs: add breadcrumbs to articles and tutorials

* commit '796ce77abf3d1d006576490c286e72ebf0736280':
  docs: add breadcrumbs to articles and tutorials

13 years agoMerge "Bring back auto clear backoff on reconnect Also, make sure it works this time...
Alon Albert [Wed, 16 Feb 2011 18:20:40 +0000 (10:20 -0800)]
Merge "Bring back auto clear backoff on reconnect Also, make sure it works this time by calling onBackoffChanged()"

13 years agoMerge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread
Alon Albert [Wed, 16 Feb 2011 18:20:13 +0000 (10:20 -0800)]
Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread

13 years agoMerge "Remove legacy, AwesomePlayer-based http live implementation."
Andreas Huber [Wed, 16 Feb 2011 18:12:11 +0000 (10:12 -0800)]
Merge "Remove legacy, AwesomePlayer-based http live implementation."

13 years agoam 54f9be2a: am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable...
daniel_tomas [Wed, 16 Feb 2011 17:45:41 +0000 (09:45 -0800)]
am 54f9be2a: am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation

* commit '54f9be2a265a0e06bb7f6c50acf674f47b8fe18a':
  New API added in NfcAdapter to enable/disable SE card emulation

13 years agoam 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:43:08 +0000 (09:43 -0800)]
am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation

* commit '99e267ebcf8f950cbdcf8438cc7383e1fc6a56c2':
  New API added in NfcAdapter to enable/disable SE card emulation

13 years agoam 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation
daniel_tomas [Wed, 16 Feb 2011 17:41:00 +0000 (09:41 -0800)]
am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation

* commit '7bcd2c62ebfad640e8082c1dc700c9d8c57aba81':
  New API added in NfcAdapter to enable/disable SE card emulation

13 years agoMerge "Fit to screen for the first new picture with enough different width."
Shimeng (Simon) Wang [Wed, 16 Feb 2011 17:28:16 +0000 (09:28 -0800)]
Merge "Fit to screen for the first new picture with enough different width."

13 years agoam d8d51fed: am 8c8e9d9a: am 1df862a4: Minor doc update.
Nick Pelly [Wed, 16 Feb 2011 17:27:37 +0000 (09:27 -0800)]
am d8d51fed: am 8c8e9d9a: am 1df862a4: Minor doc update.

* commit 'd8d51fed861cd36f57f1eb2542def23322379d7c':
  Minor doc update.

13 years agoam 9fb2b136: am f79bbc30: Merge "docs: edit doc titles to match side nav and add...
Scott Main [Wed, 16 Feb 2011 17:25:29 +0000 (09:25 -0800)]
am 9fb2b136: am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb

* commit '9fb2b13600a7192031d37cd41525eacb736bcf11':
  docs: edit doc titles to match side nav and add breadcrumb links

13 years agoam 8c8e9d9a: am 1df862a4: Minor doc update.
Nick Pelly [Wed, 16 Feb 2011 17:25:09 +0000 (09:25 -0800)]
am 8c8e9d9a: am 1df862a4: Minor doc update.

* commit '8c8e9d9a7f1bddbc995a5c088f19a0a3be1f6a5b':
  Minor doc update.

13 years agoam 0bbf9667: (-s ours) am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Deriv...
Andreas Huber [Wed, 16 Feb 2011 17:23:11 +0000 (09:23 -0800)]
am 0bbf9667: (-s ours) am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

* commit '0bbf96675783758b6ffdff8996d7166ae1dec15b':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

13 years agoam 1df862a4: Minor doc update.
Nick Pelly [Wed, 16 Feb 2011 17:23:08 +0000 (09:23 -0800)]
am 1df862a4: Minor doc update.

* commit '1df862a4656bb0d7a3329311b1e243fc6db32448':
  Minor doc update.

13 years agoam f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links...
Scott Main [Wed, 16 Feb 2011 17:21:06 +0000 (09:21 -0800)]
am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb

* commit 'f79bbc305bdb0c8aa46dd7e621e229b8fd447ab9':
  docs: edit doc titles to match side nav and add breadcrumb links

13 years agoam 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source...
Andreas Huber [Wed, 16 Feb 2011 17:10:19 +0000 (09:10 -0800)]
am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

* commit '16d94f580a50dafbe4dda3e9fe2ef47897ac1fe5':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

13 years agoMerge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb
Scott Main [Wed, 16 Feb 2011 17:06:43 +0000 (09:06 -0800)]
Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb

13 years agoam 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the...
Andreas Huber [Wed, 16 Feb 2011 17:02:08 +0000 (09:02 -0800)]
am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

* commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096':
  DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary

13 years agoMerge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint...
Andreas Huber [Wed, 16 Feb 2011 16:50:37 +0000 (08:50 -0800)]
Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread

13 years agoam e131ccb6: am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech...
Robert Ly [Wed, 16 Feb 2011 07:01:37 +0000 (23:01 -0800)]
am e131ccb6: am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread

* commit 'e131ccb615172e317501f721c30b152823c566bf':
  Adding package summary for nfc.tech package

13 years agoam c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into...
Robert Ly [Wed, 16 Feb 2011 06:58:51 +0000 (22:58 -0800)]
am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread

* commit 'c3ebf27a511934d7529b2fbde223169e83c74561':
  Adding package summary for nfc.tech package

13 years agoam 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread
Robert Ly [Wed, 16 Feb 2011 06:54:52 +0000 (22:54 -0800)]
am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread

* commit '4bebbe5fea1b6d7f5deff6d41d7633308607c08b':
  Adding package summary for nfc.tech package

13 years agoam a925a3ca: am 9cf2fa02: docs: add breadcrumbs to developing docs
Scott Main [Wed, 16 Feb 2011 04:15:50 +0000 (20:15 -0800)]
am a925a3ca: am 9cf2fa02: docs: add breadcrumbs to developing docs

* commit 'a925a3ca1f0aed3aeebfd8eff569d5238ccf8213':
  docs: add breadcrumbs to developing docs

13 years agoam c35d0ee1: am a766a8be: docs: add breadcrumbs to testing docs
Scott Main [Wed, 16 Feb 2011 04:15:36 +0000 (20:15 -0800)]
am c35d0ee1: am a766a8be: docs: add breadcrumbs to testing docs

* commit 'c35d0ee105a80ed4f3c749a9f12a23adc7791ddb':
  docs: add breadcrumbs to testing docs

13 years agoam f0b4f100: am f2d52938: Merge "docs: revise loader doc title" into honeycomb
Scott Main [Wed, 16 Feb 2011 04:15:31 +0000 (20:15 -0800)]
am f0b4f100: am f2d52938: Merge "docs: revise loader doc title" into honeycomb

* commit 'f0b4f1007935a724cd0cfa64520ac98ee68a2266':
  docs: revise loader doc title

13 years agoam 8700547f: am e250cbb8: Merge "doc change: add rel note links to external tools...
Robert Ly [Wed, 16 Feb 2011 04:15:26 +0000 (20:15 -0800)]
am 8700547f: am e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb

* commit '8700547f5565ae899e7a08271b74b69cc32c3c4f':
  doc change: add rel note links to external tools site

13 years agoam a64507ee: am c918e4a8: docs: add parent links to graphics docs
Scott Main [Wed, 16 Feb 2011 04:15:12 +0000 (20:15 -0800)]
am a64507ee: am c918e4a8: docs: add parent links to graphics docs

* commit 'a64507eed242b62d8c29dc4e687d61b44ae9a377':
  docs: add parent links to graphics docs

13 years agoam 0ab1b326: am 13033ea5: docs: fix misc broken links
Scott Main [Wed, 16 Feb 2011 04:15:00 +0000 (20:15 -0800)]
am 0ab1b326: am 13033ea5: docs: fix misc broken links

* commit '0ab1b326c72afb2bd7798462fcdd8e5d3b440fd2':
  docs: fix misc broken links

13 years agoam 9cf2fa02: docs: add breadcrumbs to developing docs
Scott Main [Wed, 16 Feb 2011 04:08:30 +0000 (20:08 -0800)]
am 9cf2fa02: docs: add breadcrumbs to developing docs

* commit '9cf2fa023bb55979853995a34a9fa9996a2212f0':
  docs: add breadcrumbs to developing docs

13 years agoam a766a8be: docs: add breadcrumbs to testing docs
Scott Main [Wed, 16 Feb 2011 04:08:26 +0000 (20:08 -0800)]
am a766a8be: docs: add breadcrumbs to testing docs

* commit 'a766a8bee24b46fdeea2cc891e6ce202d906245f':
  docs: add breadcrumbs to testing docs

13 years agoam f2d52938: Merge "docs: revise loader doc title" into honeycomb
Scott Main [Wed, 16 Feb 2011 04:08:21 +0000 (20:08 -0800)]
am f2d52938: Merge "docs: revise loader doc title" into honeycomb

* commit 'f2d5293844a3c782ccd415d327007ec5e7681a26':
  docs: revise loader doc title

13 years agoam e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb
Robert Ly [Wed, 16 Feb 2011 04:08:17 +0000 (20:08 -0800)]
am e250cbb8: Merge "doc change: add rel note links to external tools site" into honeycomb

* commit 'e250cbb8d5ea787c318bba384fd9cb46b446ea3d':
  doc change: add rel note links to external tools site

13 years agoam c918e4a8: docs: add parent links to graphics docs
Scott Main [Wed, 16 Feb 2011 04:08:12 +0000 (20:08 -0800)]
am c918e4a8: docs: add parent links to graphics docs

* commit 'c918e4a86d42d89cb893b0150358cfd01ef7d532':
  docs: add parent links to graphics docs

13 years agoam 13033ea5: docs: fix misc broken links
Scott Main [Wed, 16 Feb 2011 04:08:07 +0000 (20:08 -0800)]
am 13033ea5: docs: fix misc broken links

* commit '13033ea52714d48d754c6bc8fccb18514c645a47':
  docs: fix misc broken links

13 years agoMerge "allow root to call into surfaceflinger"
Mathias Agopian [Wed, 16 Feb 2011 03:46:23 +0000 (19:46 -0800)]
Merge "allow root to call into surfaceflinger"

13 years agoallow root to call into surfaceflinger
Mathias Agopian [Wed, 16 Feb 2011 01:54:56 +0000 (17:54 -0800)]
allow root to call into surfaceflinger

this is useful for running standalone tests
with standalone SurfaceFlinger.

Change-Id: I08d054f6214affa3a777a82765f4e0bd256ba26d

13 years agoMerge "docs: revise loader doc title" into honeycomb
Scott Main [Wed, 16 Feb 2011 01:54:28 +0000 (17:54 -0800)]
Merge "docs: revise loader doc title" into honeycomb

13 years agoMerge "Adding package summary for nfc.tech package" into gingerbread
Robert Ly [Wed, 16 Feb 2011 01:44:56 +0000 (17:44 -0800)]
Merge "Adding package summary for nfc.tech package" into gingerbread

13 years agoMerge "Use InetAddress.parseNumericAddress."
Elliott Hughes [Wed, 16 Feb 2011 01:42:55 +0000 (17:42 -0800)]
Merge "Use InetAddress.parseNumericAddress."

13 years agoMerge "doc change: add rel note links to external tools site" into honeycomb
Robert Ly [Wed, 16 Feb 2011 01:38:56 +0000 (17:38 -0800)]
Merge "doc change: add rel note links to external tools site" into honeycomb

13 years agoMerge "Add AAC extractor"
Gloria Wang [Wed, 16 Feb 2011 01:22:01 +0000 (17:22 -0800)]
Merge "Add AAC extractor"

13 years agoMerge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state"
Jim Miller [Wed, 16 Feb 2011 00:22:08 +0000 (16:22 -0800)]
Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state"

13 years agoMerge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs...
Andreas Huber [Tue, 15 Feb 2011 23:56:20 +0000 (15:56 -0800)]
Merge "Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)""

13 years agoam 40534523: am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
Scott Main [Tue, 15 Feb 2011 23:52:25 +0000 (15:52 -0800)]
am 40534523: am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions

* commit '40534523304784fdc46f0de28fcaad9d3df2821b':
  docs: add 'new' tags and resolve some doc title regressions

13 years agoam a460a9ac: docs: add \'new\' tags and resolve some doc title regressions
Scott Main [Tue, 15 Feb 2011 23:49:43 +0000 (15:49 -0800)]
am a460a9ac: docs: add \'new\' tags and resolve some doc title regressions

* commit 'a460a9ac79bb79c2a410401a907a6bdf21320746':
  docs: add 'new' tags and resolve some doc title regressions

13 years agoam 090662bd: am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a38...
Robert Ly [Tue, 15 Feb 2011 23:47:56 +0000 (15:47 -0800)]
am 090662bd: am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

* commit '090662bdfc90c5f8925f554efd6ece12730a98dd':
  cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

13 years agoam c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447
Robert Ly [Tue, 15 Feb 2011 23:42:14 +0000 (15:42 -0800)]
am c00cc5f2: cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

* commit 'c00cc5f22689e0c6dba50b6bf8dc085ffca20d39':
  cherry pick Change-Id: I380cebe8d015749a00f6f3d22fdc5c55a380f447

13 years agoMerge "Small optimization when getting the spans"
Fabrice Di Meglio [Tue, 15 Feb 2011 23:28:50 +0000 (15:28 -0800)]
Merge "Small optimization when getting the spans"

13 years agoMerge "Fix typo."
Daisuke Miyakawa [Tue, 15 Feb 2011 23:21:09 +0000 (15:21 -0800)]
Merge "Fix typo."

13 years agoMerge "Fix bug 3362273 - Make overscroll glow appear within padding region"
Adam Powell [Tue, 15 Feb 2011 23:07:55 +0000 (15:07 -0800)]
Merge "Fix bug 3362273 - Make overscroll glow appear within padding region"

13 years agoMerge "Remove some unused wifi dhcp code."
Robert Greenwalt [Tue, 15 Feb 2011 22:26:37 +0000 (14:26 -0800)]
Merge "Remove some unused wifi dhcp code."

13 years agoMerge "Derive the Transport "source" attribute from the RTSP endpoint address if...
Andreas Huber [Tue, 15 Feb 2011 22:12:56 +0000 (14:12 -0800)]
Merge "Derive the Transport "source" attribute from the RTSP endpoint address if necessary"

13 years agoMerge "Work around several issues with non-compliant RTSP servers."
Andreas Huber [Tue, 15 Feb 2011 21:31:14 +0000 (13:31 -0800)]
Merge "Work around several issues with non-compliant RTSP servers."

13 years agoMerge "Don't change keyboard state in setIconifiedByDefault."
Amith Yamasani [Tue, 15 Feb 2011 21:06:20 +0000 (13:06 -0800)]
Merge "Don't change keyboard state in setIconifiedByDefault."

13 years agoMerge branch 'master' of ssh://android-git:29418/platform/frameworks/base
John Wang [Tue, 15 Feb 2011 20:43:05 +0000 (12:43 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

13 years agoam d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is availab...
John Wang [Tue, 15 Feb 2011 20:43:00 +0000 (12:43 -0800)]
am d0789ec9: am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit 'd0789ec99593bf556c88ff866a81d23449df1911':
  Only decode EXT1 tag when it is available.

13 years agoMerge "MTP host: disable some test code"
Mike Lockwood [Tue, 15 Feb 2011 20:42:58 +0000 (12:42 -0800)]
Merge "MTP host: disable some test code"

13 years agoam 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into...
John Wang [Tue, 15 Feb 2011 20:40:49 +0000 (12:40 -0800)]
am 39014026: am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '3901402600daa5ef9fbcae7b4b9400ee8ca1a317':
  Only decode EXT1 tag when it is available.

13 years agoam 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread
John Wang [Tue, 15 Feb 2011 20:38:38 +0000 (12:38 -0800)]
am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread

* commit '29853a356bb6ddb094df6d0f5dd04e2a63f25147':
  Only decode EXT1 tag when it is available.

13 years agoam 80dcc6ae: am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:37:36 +0000 (12:37 -0800)]
am 80dcc6ae: am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

* commit '80dcc6aebfbca724f49c83d30cdad51ef980f0db':
  SDK docs: Hierarchy Viewer V2

13 years agoMerge "fix [3452769] SensorEventListener can cause a java allocation at each received...
Mathias Agopian [Tue, 15 Feb 2011 20:34:48 +0000 (12:34 -0800)]
Merge "fix [3452769] SensorEventListener can cause a java allocation at each received event [external]"

13 years agoMerge "Only decode EXT1 tag when it is available." into gingerbread
John Wang [Tue, 15 Feb 2011 20:34:37 +0000 (12:34 -0800)]
Merge "Only decode EXT1 tag when it is available." into gingerbread

13 years agoam 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:34:35 +0000 (12:34 -0800)]
am 6d1387b6: Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

* commit '6d1387b6ecf0aaea6f36472fcd1a499824fd30b5':
  SDK docs: Hierarchy Viewer V2

13 years agoMerge "SDK docs: Hierarchy Viewer V2" into honeycomb
Joe Malin [Tue, 15 Feb 2011 20:32:48 +0000 (12:32 -0800)]
Merge "SDK docs: Hierarchy Viewer V2" into honeycomb

13 years agoam ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around...
Andreas Huber [Tue, 15 Feb 2011 19:53:47 +0000 (11:53 -0800)]
am ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'ad1831a56fd60779464326468ee1d471a10f71a0':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoMerge "Keep overview mode when screen is rotated."
Shimeng (Simon) Wang [Tue, 15 Feb 2011 19:52:16 +0000 (11:52 -0800)]
Merge "Keep overview mode when screen is rotated."

13 years agoam e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with...
Andreas Huber [Tue, 15 Feb 2011 19:51:33 +0000 (11:51 -0800)]
am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'e0c9f2757b0ebd291fec89ebb520878aacd3f7dc':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoam d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
Andreas Huber [Tue, 15 Feb 2011 19:49:03 +0000 (11:49 -0800)]
am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'd1ba051a465518fa4325c364ed77025fc1a2a794':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

13 years agoam 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match...
Scott Main [Tue, 15 Feb 2011 19:38:50 +0000 (11:38 -0800)]
am 2b0c6fdf: am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb

* commit '2b0c6fdfff0faf17163d126ac21c1651e4053968':
  docs: revise a couple sample app names to match side nav

13 years agoam 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into...
Scott Main [Tue, 15 Feb 2011 19:36:44 +0000 (11:36 -0800)]
am 97ef3b41: Merge "docs: revise a couple sample app names to match side nav" into honeycomb

* commit '97ef3b416ada559c446d1d21d70d2604433b92f5':
  docs: revise a couple sample app names to match side nav

13 years agoMerge "docs: revise a couple sample app names to match side nav" into honeycomb
Scott Main [Tue, 15 Feb 2011 19:33:43 +0000 (11:33 -0800)]
Merge "docs: revise a couple sample app names to match side nav" into honeycomb

13 years agoMerge "Fix some bugs with MenuPopupHelper and ListPopupWindow"
Adam Powell [Tue, 15 Feb 2011 19:16:01 +0000 (11:16 -0800)]
Merge "Fix some bugs with MenuPopupHelper and ListPopupWindow"

13 years agoam 9b833cf0: am 5a44efb4: docs: fix markup error
Scott Main [Tue, 15 Feb 2011 19:09:19 +0000 (11:09 -0800)]
am 9b833cf0: am 5a44efb4: docs: fix markup error

* commit '9b833cf0cb499f2fe66319f9773f88fb94a85709':
  docs: fix markup error

13 years agoam 5a44efb4: docs: fix markup error
Scott Main [Tue, 15 Feb 2011 19:07:06 +0000 (11:07 -0800)]
am 5a44efb4: docs: fix markup error

* commit '5a44efb42738e4fd1b448004f74dc96372801936':
  docs: fix markup error

13 years agoMerge "Text insertion cursor is now defined by a Drawable."
Gilles Debunne [Tue, 15 Feb 2011 18:41:30 +0000 (10:41 -0800)]
Merge "Text insertion cursor is now defined by a Drawable."

13 years agoMerge "Keep mobile site's text wrap scale unchanged."
Shimeng (Simon) Wang [Tue, 15 Feb 2011 18:12:29 +0000 (10:12 -0800)]
Merge "Keep mobile site's text wrap scale unchanged."

13 years agoMerge "Fix when >2 keyframes supplied"
Chet Haase [Tue, 15 Feb 2011 14:46:48 +0000 (06:46 -0800)]
Merge "Fix when >2 keyframes supplied"

13 years agoMerge "Add the Id of InputMethodInfo at the tail of Application label at sorting...
satok [Tue, 15 Feb 2011 08:58:29 +0000 (00:58 -0800)]
Merge "Add the Id of InputMethodInfo at the tail of Application label at sorting InputMethods"

13 years agoMerge "VideoEditor:Inconsistance defines:Issue ID:3419090"
Basavapatna Dattaguru [Tue, 15 Feb 2011 04:14:38 +0000 (20:14 -0800)]
Merge "VideoEditor:Inconsistance defines:Issue ID:3419090"

13 years agoMerge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes"
Basavapatna Dattaguru [Tue, 15 Feb 2011 03:31:52 +0000 (19:31 -0800)]
Merge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes"

13 years agoMerge "Disable cross-app drag/drop"
Christopher Tate [Tue, 15 Feb 2011 02:14:49 +0000 (18:14 -0800)]
Merge "Disable cross-app drag/drop"

13 years agoMerge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets...
Mathias Agopian [Tue, 15 Feb 2011 02:14:16 +0000 (18:14 -0800)]
Merge "fix [3452750] Issue 14634: SensorManager.getRotationMatrixFromVector gets NaN-Values [external]"

13 years agoMerge "WebView's scrollBarStyle need to be set at init"
Teng-Hui Zhu [Tue, 15 Feb 2011 01:23:58 +0000 (17:23 -0800)]
Merge "WebView's scrollBarStyle need to be set at init"

13 years agoMerge "Gracefully handle drawing caches allocation failure. Bug #3431451"
Romain Guy [Tue, 15 Feb 2011 00:34:15 +0000 (16:34 -0800)]
Merge "Gracefully handle drawing caches allocation failure. Bug #3431451"

13 years agoMerge "Fix 3409550: Fix crash caused when max pattern attempts met."
Jim Miller [Tue, 15 Feb 2011 00:27:18 +0000 (16:27 -0800)]
Merge "Fix 3409550: Fix crash caused when max pattern attempts met."

13 years agoMerge "Fix 3423212: Constrain large app icons to 64x64 in recents."
Jim Miller [Tue, 15 Feb 2011 00:16:30 +0000 (16:16 -0800)]
Merge "Fix 3423212: Constrain large app icons to 64x64 in recents."

13 years agoMerge "VideoEditor: Issue ID:3396697 Missing Files added"
Basavapatna Dattaguru [Tue, 15 Feb 2011 00:12:13 +0000 (16:12 -0800)]
Merge "VideoEditor: Issue ID:3396697 Missing Files added"

13 years agoam d2bd6f4d: am 64b12eac: docs: add links to sample apps
Scott Main [Tue, 15 Feb 2011 00:10:10 +0000 (16:10 -0800)]
am d2bd6f4d: am 64b12eac: docs: add links to sample apps

* commit 'd2bd6f4d49489db429650a3308554c1d45cb31b6':
  docs: add links to sample apps