OSDN Git Service
Andreas Huber [Mon, 4 Apr 2011 19:00:20 +0000 (12:00 -0700)]
Merge "Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock."
Robert Ly [Mon, 4 Apr 2011 18:55:23 +0000 (11:55 -0700)]
am
cbfeda13: am
6f7e4cb5: am
3f39f653: Adding package description for android.hardware.usb
* commit '
cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225':
Adding package description for android.hardware.usb
Robert Ly [Mon, 4 Apr 2011 18:48:51 +0000 (11:48 -0700)]
am
6f7e4cb5: am
3f39f653: Adding package description for android.hardware.usb
* commit '
6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
Adding package description for android.hardware.usb
Robert Ly [Mon, 4 Apr 2011 18:41:02 +0000 (11:41 -0700)]
am
3f39f653: Adding package description for android.hardware.usb
* commit '
3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
Adding package description for android.hardware.usb
Adam Cohen [Mon, 4 Apr 2011 18:27:07 +0000 (11:27 -0700)]
Merge "Making StackView res-out and click feedback colors stylable"
Dirk Dougherty [Sun, 3 Apr 2011 21:07:49 +0000 (14:07 -0700)]
am
9e374cf4: am
826af857: am
f9cdf7fe: Doc change: add diff report for API 12.
* commit '
9e374cf4941c18059ce47b5eba9ace08d06f57b0':
Doc change: add diff report for API 12.
Dirk Dougherty [Sun, 3 Apr 2011 21:06:00 +0000 (14:06 -0700)]
am
826af857: am
f9cdf7fe: Doc change: add diff report for API 12.
* commit '
826af8576b27d18997440bec75daa26434033c0c':
Doc change: add diff report for API 12.
Dirk Dougherty [Sun, 3 Apr 2011 21:04:20 +0000 (14:04 -0700)]
am
f9cdf7fe: Doc change: add diff report for API 12.
* commit '
f9cdf7feb47aa142e11862f5694c0a29ac013a51':
Doc change: add diff report for API 12.
Dirk Dougherty [Sun, 3 Apr 2011 21:01:40 +0000 (14:01 -0700)]
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
Dirk Dougherty [Sun, 3 Apr 2011 20:56:07 +0000 (13:56 -0700)]
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
Dirk Dougherty [Sun, 3 Apr 2011 20:50:48 +0000 (13:50 -0700)]
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
Dirk Dougherty [Sun, 3 Apr 2011 20:40:48 +0000 (13:40 -0700)]
Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
Brian Carlstrom [Sun, 3 Apr 2011 03:39:32 +0000 (20:39 -0700)]
Merge "Tracking merge of dalvik-dev to master"
Scott Main [Sat, 2 Apr 2011 00:45:41 +0000 (17:45 -0700)]
am
e1e46c72: am
342d8fdb: am
90a1befa: am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
e1e46c7263948f5127f618e905fe5fb3ec0b3437':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:43:12 +0000 (17:43 -0700)]
am
342d8fdb: am
90a1befa: am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
342d8fdbb6ee256da90ada3e48e198bbc9e8d8e3':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:41:40 +0000 (17:41 -0700)]
am
90a1befa: am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
90a1befa551a9e6dc8f06b7331e26e6470ab824f':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:39:05 +0000 (17:39 -0700)]
am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
27690ebabc915091956f0331023c9d074177271d':
docs: update device dashboard
Scott Main [Sat, 2 Apr 2011 00:36:42 +0000 (17:36 -0700)]
Merge "docs: update device dashboard" into honeycomb
Wink Saville [Fri, 1 Apr 2011 23:38:43 +0000 (16:38 -0700)]
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.
Wink Saville [Fri, 1 Apr 2011 23:36:25 +0000 (16:36 -0700)]
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.
Wink Saville [Fri, 1 Apr 2011 23:34:51 +0000 (16:34 -0700)]
Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
Jeff Brown [Fri, 1 Apr 2011 23:33:40 +0000 (16:33 -0700)]
Merge "Fix dispatcher crash when input monitoring enabled. Also ensure that we actually log assertion failures."
Scott Main [Fri, 1 Apr 2011 23:27:19 +0000 (16:27 -0700)]
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
Scott Main [Fri, 1 Apr 2011 23:25:14 +0000 (16:25 -0700)]
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
Scott Main [Fri, 1 Apr 2011 23:22:35 +0000 (16:22 -0700)]
am
6261861a: am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
6261861a94448e4fbc26e313ce1410a184a10914':
docs: update homepage announcement for Google IO
Scott Main [Fri, 1 Apr 2011 23:19:30 +0000 (16:19 -0700)]
am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO
Scott Main [Fri, 1 Apr 2011 23:17:40 +0000 (16:17 -0700)]
Merge "docs: update homepage announcement for Google IO" into honeycomb
Jeff Brown [Fri, 1 Apr 2011 23:15:13 +0000 (16:15 -0700)]
Fix dispatcher crash when input monitoring enabled.
Also ensure that we actually log assertion failures.
Bug:
4203092
Change-Id: I5c14bc41b2255f876858121f5572e2de75cabcc3
Mathias Agopian [Fri, 1 Apr 2011 21:58:43 +0000 (14:58 -0700)]
Merge "SurfaceTexture can now force the client to request a buffer"
Mathias Agopian [Fri, 1 Apr 2011 21:45:34 +0000 (14:45 -0700)]
Merge "ANativeWindow_setBuffersGeometry now returns proper error codes"
Mathias Agopian [Fri, 1 Apr 2011 02:10:24 +0000 (19:10 -0700)]
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
Chet Haase [Fri, 1 Apr 2011 21:34:16 +0000 (14:34 -0700)]
Merge "Fix the build - change a reference to a namespace specification"
James Dong [Fri, 1 Apr 2011 21:06:56 +0000 (14:06 -0700)]
Merge "ISurfaceTexture does not have a method getIdentity()"
Andreas Huber [Fri, 1 Apr 2011 21:02:06 +0000 (14:02 -0700)]
Merge "Remove legacy hack to only drop frames every other late frame"
Andreas Huber [Fri, 1 Apr 2011 21:01:09 +0000 (14:01 -0700)]
Merge "Fix a webm-seek issue introduced when adding support for streaming webm"
Chet Haase [Fri, 1 Apr 2011 20:28:10 +0000 (13:28 -0700)]
Merge "Add logging of graphics acceleration info to bugreports"
Jeff Brown [Fri, 1 Apr 2011 19:56:35 +0000 (12:56 -0700)]
Merge "Add a little input event consistency verifier."
Robert Greenwalt [Fri, 1 Apr 2011 18:39:02 +0000 (11:39 -0700)]
Merge "Fix a bad merge."
Mike Lockwood [Fri, 1 Apr 2011 18:38:52 +0000 (11:38 -0700)]
am
1c56976a: am
38f04c0f: am
11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '
1c56976a774434bd279b6181c4fc3c555c4648c2':
Improve Javadoc for USB Manager and MTP/PTP support.
Mike Lockwood [Fri, 1 Apr 2011 18:37:05 +0000 (11:37 -0700)]
am
38f04c0f: am
11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '
38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
Improve Javadoc for USB Manager and MTP/PTP support.
Mike Lockwood [Fri, 1 Apr 2011 18:34:39 +0000 (11:34 -0700)]
am
11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.
* commit '
11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.
Wink Saville [Fri, 1 Apr 2011 17:40:57 +0000 (10:40 -0700)]
am
7c6f532a: am
dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
* commit '
7c6f532ae9b90734edcfe68f8dee078ea8c4b8a5':
Airplane mode on always timed out when camping on LTE
Wink Saville [Fri, 1 Apr 2011 17:38:40 +0000 (10:38 -0700)]
am
4aff3e36: am
0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
* commit '
4aff3e363cae550a95c8082ec153bc739fe97db4':
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
Wink Saville [Fri, 1 Apr 2011 17:32:37 +0000 (10:32 -0700)]
am
dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
* commit '
dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
Airplane mode on always timed out when camping on LTE
Wink Saville [Fri, 1 Apr 2011 17:30:44 +0000 (10:30 -0700)]
am
0198fff9: Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
* commit '
0198fff90430d9f974b0284fc3659434406c751b':
Rename ro.telephony.lte_on_cdma to telephony.lte_on_cdma.
Wink Saville [Fri, 1 Apr 2011 17:28:22 +0000 (10:28 -0700)]
Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE
Jean-Baptiste Queru [Fri, 1 Apr 2011 03:10:59 +0000 (20:10 -0700)]
am
789d4ade: ignore from gingerbread-plus-aosp
* commit '
789d4ade299e0c986b9652542b7adf26d38816f4':
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Jean-Baptiste Queru [Fri, 1 Apr 2011 03:07:45 +0000 (20:07 -0700)]
ignore from gingerbread-plus-aosp
Change-Id: I80fc76acaa18aae7b313bb19489f277ce4700368
Jeff Brown [Tue, 1 Mar 2011 02:27:14 +0000 (18:27 -0800)]
Add a little input event consistency verifier.
The idea is to assist with debugging by identifying cases in which
the input event stream is corrupted.
Change-Id: I0a00e52bbe2716be1b3dfc7c02a754492d8e7f1f
Scott Main [Fri, 1 Apr 2011 02:16:34 +0000 (19:16 -0700)]
am
efbdbded: am
77de14d6: am
1ccdc235: am
e979332f: docs: fix markup bugs
* commit '
efbdbdedeb87c3dd33b6813a1cf48a8d8cadfe39':
docs: fix markup bugs
Scott Main [Fri, 1 Apr 2011 02:14:00 +0000 (19:14 -0700)]
am
77de14d6: am
1ccdc235: am
e979332f: docs: fix markup bugs
* commit '
77de14d64f1b2a36a117869d412a3a74e6823cd7':
docs: fix markup bugs
Scott Main [Fri, 1 Apr 2011 02:10:56 +0000 (19:10 -0700)]
am
1ccdc235: am
e979332f: docs: fix markup bugs
* commit '
1ccdc235716715e7c6f13cab42e4195454e04615':
docs: fix markup bugs
Scott Main [Fri, 1 Apr 2011 02:06:33 +0000 (19:06 -0700)]
am
e979332f: docs: fix markup bugs
* commit '
e979332f38e677db4c9d89f695352ed41052553d':
docs: fix markup bugs
Russell Brenner [Fri, 1 Apr 2011 02:03:09 +0000 (19:03 -0700)]
am
9e57a4df: am
7b445dd7: am
49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '
9e57a4df48558f4d4c12a98b9720f7603803faca':
Added include/private/hwui/DrawGlInfo.h
Russell Brenner [Fri, 1 Apr 2011 02:00:35 +0000 (19:00 -0700)]
am
7b445dd7: am
49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '
7b445dd7c0814a39eaf912fa1a871f00d5190550':
Added include/private/hwui/DrawGlInfo.h
Russell Brenner [Fri, 1 Apr 2011 01:55:26 +0000 (18:55 -0700)]
am
c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 buildable
* commit '
c6b22e2727bd3730edd5ad72831a9bb4670d00f3':
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Russell Brenner [Fri, 1 Apr 2011 01:55:20 +0000 (18:55 -0700)]
am
49b49f8f: Added include/private/hwui/DrawGlInfo.h
* commit '
49b49f8fb6d094768d4e093353b34271f2da1bfc':
Added include/private/hwui/DrawGlInfo.h
Russell Brenner [Fri, 1 Apr 2011 00:32:20 +0000 (17:32 -0700)]
Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildable
Change-Id: If1c1610efcc0e0bc6de88c75712baed91624b1a7
Eric Hassold [Fri, 1 Apr 2011 00:34:13 +0000 (17:34 -0700)]
Merge "Initialize reference counter for egl_display_t"
Eric Hassold [Thu, 31 Mar 2011 23:52:02 +0000 (16:52 -0700)]
Initialize reference counter for egl_display_t
Add missing member initialization for reference counter, used to determine
if a context is ready.
Change-Id: I45f81177ac2851129681f827afe015b60b3cd73c
Wink Saville [Thu, 31 Mar 2011 22:55:02 +0000 (15:55 -0700)]
am
2a936154: am
b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
* commit '
2a936154f607d9454864045bd798ff22618de41a':
Telephony: Add Powerdown Cause to PDP Deactivate Message.
Wink Saville [Thu, 31 Mar 2011 22:52:58 +0000 (15:52 -0700)]
am
b90f9c37: Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
* commit '
b90f9c370e5b1b1825016e48b864e8eda6d5f89c':
Telephony: Add Powerdown Cause to PDP Deactivate Message.
Wink Saville [Thu, 31 Mar 2011 22:51:07 +0000 (15:51 -0700)]
Merge "Telephony: Add Powerdown Cause to PDP Deactivate Message." into honeycomb-LTE
Wink Saville [Thu, 31 Mar 2011 20:21:50 +0000 (13:21 -0700)]
am
cac1411e: am
11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
* commit '
cac1411e9966b155a099f24720104a84de7aa50b':
Telephony: Cleanup of SIM handling in CdmaLteSST.
Wink Saville [Thu, 31 Mar 2011 20:19:06 +0000 (13:19 -0700)]
am
11feacb3: Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
* commit '
11feacb348e624bcdbb073a32c1fc1d8bdc7bae3':
Telephony: Cleanup of SIM handling in CdmaLteSST.
Wink Saville [Thu, 31 Mar 2011 20:16:41 +0000 (13:16 -0700)]
Merge "Telephony: Cleanup of SIM handling in CdmaLteSST." into honeycomb-LTE
Glenn Kasten [Thu, 31 Mar 2011 18:11:43 +0000 (11:11 -0700)]
Glenn Kasten [Thu, 31 Mar 2011 18:08:52 +0000 (11:08 -0700)]
Glenn Kasten [Thu, 31 Mar 2011 18:06:41 +0000 (11:06 -0700)]
Robert Greenwalt [Thu, 31 Mar 2011 17:53:58 +0000 (10:53 -0700)]
am
026ba931: (-s ours) Merge "Fix the build." into honeycomb-plus-aosp
* commit '
026ba931d448919ffc515f7e66fe96950f89d22e':
Fix the build.
Robert Greenwalt [Thu, 31 Mar 2011 17:47:32 +0000 (10:47 -0700)]
Merge "Fix the build." into honeycomb-plus-aosp
Wink Saville [Thu, 31 Mar 2011 17:28:10 +0000 (10:28 -0700)]
am
72ec108b: am
b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE
* commit '
72ec108b0c1f6aa8615974c3dbb63cc02d1b1391':
Telephony: Update LTE RILConstants to match ril.h
Wink Saville [Thu, 31 Mar 2011 17:26:12 +0000 (10:26 -0700)]
am
b136aa6c: Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE
* commit '
b136aa6c9a1c043ff91357cea9e0b6597c904507':
Telephony: Update LTE RILConstants to match ril.h
Wink Saville [Thu, 31 Mar 2011 17:23:11 +0000 (10:23 -0700)]
Merge "Telephony: Update LTE RILConstants to match ril.h" into honeycomb-LTE
Michael Jurka [Thu, 31 Mar 2011 03:08:31 +0000 (20:08 -0700)]
Merge "Fix the build"
Jim Miller [Thu, 31 Mar 2011 03:07:50 +0000 (20:07 -0700)]
Merge "Get LockScreen working on phones."
Fabrice Di Meglio [Thu, 31 Mar 2011 01:39:38 +0000 (18:39 -0700)]
Merge "Code cleaning - suppress non useful code"
Dianne Hackborn [Thu, 31 Mar 2011 00:55:38 +0000 (17:55 -0700)]
am
fd10e6ac: am
a5b308e7: am
53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '
fd10e6ac5811f716954afdb91f9231d7fbaa0718':
Expand screen documentation with explicit screen size dimensions.
Dianne Hackborn [Thu, 31 Mar 2011 00:53:44 +0000 (17:53 -0700)]
am
a5b308e7: am
53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '
a5b308e74c44722b9414fa9be52eabacd23029b2':
Expand screen documentation with explicit screen size dimensions.
Dianne Hackborn [Thu, 31 Mar 2011 00:50:29 +0000 (17:50 -0700)]
am
53df89c7: Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
* commit '
53df89c74fb3a31a874ad575467c5d498a53646e':
Expand screen documentation with explicit screen size dimensions.
Dianne Hackborn [Thu, 31 Mar 2011 00:43:17 +0000 (17:43 -0700)]
Merge "Expand screen documentation with explicit screen size dimensions." into honeycomb-mr1
Fabrice Di Meglio [Thu, 31 Mar 2011 00:34:42 +0000 (17:34 -0700)]
Merge "Update TextLayoutCache key for supporting more SkPaint properties"
Jeff Brown [Thu, 31 Mar 2011 00:20:56 +0000 (17:20 -0700)]
Merge "Add input filter mechanism for accessibility."
Jeff Brown [Thu, 31 Mar 2011 00:20:50 +0000 (17:20 -0700)]
Merge "Move accessibility manager service to own package."
Jeff Brown [Wed, 30 Mar 2011 09:25:18 +0000 (02:25 -0700)]
Add input filter mechanism for accessibility.
This patch adds a mechanism for capturing, filtering, transforming
and injecting input events at a very low level before the input
dispatcher attempts to deliver them to applications. At this time,
the mechanism is only intended to be used by the accessibility
system to implement built-in system-level accessibility affordances.
The accessibility input filter is currently just a stub.
It logs the input events receives and reinjects them unchanged,
except that it transforms KEYCODE_Q into KEYCODE_Z.
Currently, the accessibility input filter is installed whenever
accessibility is enabled. We'll probably want to change that
so it only enables the input filter when a screen reader is
installed and we want touch exploration.
Change-Id: I35764fdf75522b69d09ebd78c9766eb7593c1afe
Justin Ho [Wed, 30 Mar 2011 23:41:41 +0000 (16:41 -0700)]
am
0b397314: am
0b251aec: am
01b13a11: Merge "Replacing browser playback controls for inactive videos Bug:
4136024" into honeycomb-mr1
* commit '
0b3973143191962d3c4372523ed450f6a5bf0863':
Replacing browser playback controls for inactive videos Bug:
4136024
Trevor Johns [Wed, 30 Mar 2011 23:41:27 +0000 (16:41 -0700)]
am
f9784a50: am
f829305f: am
e1cc88cc: am
eb344a69: Fixing line in Market IAB docs that explains how to bind to the MarketService.
* commit '
f9784a5051a4c202223f2a777e37a00af23818c8':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
Andreas Huber [Wed, 30 Mar 2011 23:40:43 +0000 (16:40 -0700)]
am
399792b8: am
06ac0399: am
b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1
* commit '
399792b83174a835840a4f47adcd34aed4e0b9ba':
When http streaming and Content-Length is unknown, make sure to return all
Jeff Hamilton [Wed, 30 Mar 2011 23:40:34 +0000 (16:40 -0700)]
am
016f8847: am
b9896794: am
96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread
* commit '
016f8847471a9d4ffe6a03c29e0600529d51d929':
Make STOP_APP_SWITCHES signatureOrSystem.
Irfan Sheriff [Wed, 30 Mar 2011 23:40:30 +0000 (16:40 -0700)]
am
c48dfd5d: (-s ours) am
11ebb6f5: (-s ours) am
05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread
* commit '
c48dfd5db6fa956be603d3c7479e3f672daea30e':
DO NOT MERGE Pick upstream intf with valid IP conf
Robert Greenwalt [Wed, 30 Mar 2011 23:40:23 +0000 (16:40 -0700)]
am
047f9d12: Merge "resolved conflicts for merge of
ce6766ea to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '
047f9d12976d90d0931a64a256bb4843d77f5e20':
Fix some alt-network issues.
Eric Fischer [Wed, 30 Mar 2011 23:40:15 +0000 (16:40 -0700)]
am
b97b78fe: (-s ours) am
acf48255: am
91c482b2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '
b97b78fe61424bd1948bc0b8d039da356774614e':
Import revised translations. DO NOT MERGE
Scott Main [Wed, 30 Mar 2011 23:40:03 +0000 (16:40 -0700)]
am
02a7f8eb: am
5c35c059: am
5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1
* commit '
02a7f8eb3a5680a5b4c00b649b461bcb65c665e4':
docs: update makefile to show javadocs diffs for api level 12
Andreas Huber [Wed, 30 Mar 2011 23:38:38 +0000 (16:38 -0700)]
am
66ec9068: am
8de5df43: am
ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1
* commit '
66ec90687f3579fe73f6baa2a188f8a4583167a3':
Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
The Android Open Source Project [Wed, 30 Mar 2011 23:38:24 +0000 (16:38 -0700)]
am
761e4500: am
5e1383f2: am
ad663d80: Merge from gingerbread
* commit '
761e4500f31fe59748a53a4f6a85daccf5cd3467':
egl: fixes for object refcounts
Brad Fitzpatrick [Wed, 30 Mar 2011 23:38:18 +0000 (16:38 -0700)]
am
5db7fd6b: am
f7a9b869: am
1e7fb7ae: Merge "Error in compound cache-control header."
* commit '
5db7fd6b70f47f31fbc59f92907b9807f9c4e64d':
Error in compound cache-control header.
Brad Fitzpatrick [Wed, 30 Mar 2011 23:38:03 +0000 (16:38 -0700)]
am
0ddcc8bc: am
b618b2ef: am
f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit '
0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6':
Handle OutOfMemoryError when decoding images in ThumbnailUtils
Brad Fitzpatrick [Wed, 30 Mar 2011 23:37:58 +0000 (16:37 -0700)]
am
f6809853: am
7a84a60d: am
1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '
f68098534e42b33cd4588bb2d2ba34ab579e11aa':
Unregister callback from binder when vibration is removed
Mike Lockwood [Wed, 30 Mar 2011 23:33:40 +0000 (16:33 -0700)]
am
08d5de83: am
cd90d1f1: am
44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
* commit '
08d5de83393dbd4d31893d96e4871a8a3628a2cd':
UsbService: Make USB disconnect handling for accessory mode more robust
Jeff Hamilton [Wed, 30 Mar 2011 23:31:27 +0000 (16:31 -0700)]
am
0c691f0e: am
ad91eee2: am
9c1ef098: Update the value for the NFC shared UID.
* commit '
0c691f0eb3bc844e778f9a61e777076658879dfd':
Update the value for the NFC shared UID.
OSDN Git Service
