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

Stephen Hines [Thu, 28 Apr 2011 18:54:29 +0000 (11:54 -0700)]

Merge "Fix RS graphics samples/tests."

Irfan Sheriff [Thu, 28 Apr 2011 18:52:56 +0000 (11:52 -0700)]

am c1f39396: am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

* commit 'c1f39396b94837f728c56b4c3e2f5c37e1d0eef7':
Define Protocol class for use with StateMachine

commit | commitdiff | tree

Conley Owens [Thu, 28 Apr 2011 18:49:43 +0000 (11:49 -0700)]

am a60594cb: Fixed bad merge in ViewRoot.java.

* commit 'a60594cb1c1399f557a82403f7fc7abb7af55250':
Fixed bad merge in ViewRoot.java.

commit | commitdiff | tree

Irfan Sheriff [Thu, 28 Apr 2011 18:48:47 +0000 (11:48 -0700)]

am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

* commit '8f87f8389866058a081e601fc0df45a3527a3150':
Define Protocol class for use with StateMachine

commit | commitdiff | tree

Eric Fischer [Thu, 28 Apr 2011 18:48:43 +0000 (11:48 -0700)]

am b2149f4a: (-s ours) am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Conley Owens [Thu, 28 Apr 2011 18:48:25 +0000 (11:48 -0700)]

am 4854f70c: Ignore change since file no longer exists

* commit '4854f70c0881ff44fabd8c261653bd90210bdc22':
Auto hide virtual keyboard

commit | commitdiff | tree

Stephen Hines [Thu, 28 Apr 2011 18:48:18 +0000 (11:48 -0700)]

am 5ac02e73: (-s ours) am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '5ac02e73c313935b1af8a536e47f74b616986dfe':
Check setName() for null string + fix rsRand().

commit | commitdiff | tree

Irfan Sheriff [Thu, 28 Apr 2011 18:38:54 +0000 (11:38 -0700)]

Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE

commit | commitdiff | tree

John Reck [Thu, 28 Apr 2011 17:38:50 +0000 (10:38 -0700)]

Merge "Use previous version if version is a codename"

commit | commitdiff | tree

Eric Fischer [Thu, 28 Apr 2011 17:25:52 +0000 (10:25 -0700)]

am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE

* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Daniel Sandler [Thu, 28 Apr 2011 17:22:49 +0000 (10:22 -0700)]

Merge "Make InputWindow.h's window types align with WindowManager.java's."

commit | commitdiff | tree

Conley Owens [Thu, 28 Apr 2011 17:10:52 +0000 (10:10 -0700)]

Ignore change since file no longer exists

commit | commitdiff | tree

Jason Sams [Thu, 28 Apr 2011 06:00:40 +0000 (23:00 -0700)]

Merge "Add dalvik code for forEach."

commit | commitdiff | tree

Jason Sams [Thu, 28 Apr 2011 06:00:25 +0000 (23:00 -0700)]

Merge "Start implementing control side forEach."

commit | commitdiff | tree

Wu-cheng Li [Thu, 28 Apr 2011 04:17:52 +0000 (21:17 -0700)]

Merge "Unhide camera focus area and metering area API."

commit | commitdiff | tree

Mathias Agopian [Thu, 28 Apr 2011 02:01:01 +0000 (19:01 -0700)]

Merge "Fix uninitialized variable in SurfaceTexture"

commit | commitdiff | tree

Mathias Agopian [Thu, 28 Apr 2011 01:57:33 +0000 (18:57 -0700)]

Fix uninitialized variable in SurfaceTexture

Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793

commit | commitdiff | tree

Stephen Hines [Thu, 28 Apr 2011 00:38:53 +0000 (17:38 -0700)]

am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '697f8b331bb339e4db716efbb96e2182aac40255':
Check setName() for null string + fix rsRand().

commit | commitdiff | tree

Stephen Hines [Thu, 28 Apr 2011 00:36:38 +0000 (17:36 -0700)]

am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
Check setName() for null string + fix rsRand().

commit | commitdiff | tree

Stephen Hines [Thu, 28 Apr 2011 00:32:40 +0000 (17:32 -0700)]

Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1

commit | commitdiff | tree

Dima Zavin [Thu, 28 Apr 2011 00:13:46 +0000 (17:13 -0700)]

Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73

* changes:
  audioflinger: don't do work in constructor, instead do it in onFirstRef
  audioflinger: enumerate all the possible audio interfaces
  audio/media: convert to using the audio HAL and new audio defs
  libmedia: move AudioParameter out of AudioSystem
  audioflinger: move legacy audio hw/policy out to libhardware_legacy

commit | commitdiff | tree

Conley Owens [Thu, 28 Apr 2011 00:01:49 +0000 (17:01 -0700)]

am c4791bd6: Merge commit \'5e3562a5\' into m

* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb':
onDetachedFromWindow is called before onAttachedToWindow

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 23:58:24 +0000 (16:58 -0700)]

Merge commit '5e3562a5' into m

Conflicts:
core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 23:54:40 +0000 (16:54 -0700)]

am eedf20c2: Ignore xml change since file no longer exists

* commit 'eedf20c2eafde695a5ae50570a21d5449d6903ea':
Remove errant tag terminator
Normalize output of XMLtree content

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 23:49:07 +0000 (16:49 -0700)]

Ignore xml change since file no longer exists

commit | commitdiff | tree

Gilles Debunne [Wed, 27 Apr 2011 23:01:30 +0000 (16:01 -0700)]

Merge "Support for overlapping spans in TextView's suggestions."

commit | commitdiff | tree

Gilles Debunne [Wed, 27 Apr 2011 23:00:57 +0000 (16:00 -0700)]

Merge "Typo in TextAppearanceSpan documentation"

commit | commitdiff | tree

Eric Fischer [Wed, 27 Apr 2011 22:30:36 +0000 (15:30 -0700)]

am a4e7353d: Import revised translations. DO NOT MERGE

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

commit | commitdiff | tree

Andreas Huber [Wed, 27 Apr 2011 22:13:42 +0000 (15:13 -0700)]

Merge "Fix omx_tests to no longer refer to test files that are no longer available."

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 21:53:26 +0000 (14:53 -0700)]

am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"

* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
Auto hide virtual keyboard

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 21:53:15 +0000 (14:53 -0700)]

am cfe7b9fc: am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"

* commit 'cfe7b9fcfaeda1e79a8673e4005bcb307f9e9313':
onDetachedFromWindow is called before onAttachedToWindow

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 21:53:10 +0000 (14:53 -0700)]

am 779fa151: am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

* commit '779fa1515d0b6cf17a449dc79f83a7c4e70ff0fe':
Remove errant tag terminator
Normalize output of XMLtree content

commit | commitdiff | tree

Chet Haase [Wed, 27 Apr 2011 21:26:40 +0000 (14:26 -0700)]

Merge "Fix various hw-accelerated line/point bugs"

commit | commitdiff | tree

Romain Guy [Wed, 27 Apr 2011 21:23:36 +0000 (14:23 -0700)]

Merge "Correctly compute tex coords for rect layers. Bug #4192695"

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:54:08 +0000 (13:54 -0700)]

am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'ba5aebd106c61567ad6be905efd18902025735aa':
Add lock before calling initEglImage

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:53:46 +0000 (13:53 -0700)]

am 13b21e60: Merge "Auto hide virtual keyboard"

* commit '13b21e608e47382cb94a0aeac13b24ac97f355d2':
Auto hide virtual keyboard

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:53:37 +0000 (13:53 -0700)]

am a538b4a2: Merge "onDetachedFromWindow is called before onAttachedToWindow"

* commit 'a538b4a206c54ef763dab4da00990a8991425e77':
onDetachedFromWindow is called before onAttachedToWindow

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:48:45 +0000 (13:48 -0700)]

am 4a4d96e7: Merge changes I0ab47e2f,Ib8016996

* commit '4a4d96e7ee682167861434cba05531f04642bf97':
Remove errant tag terminator
Normalize output of XMLtree content

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:41:12 +0000 (13:41 -0700)]

am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'ac505b86b45462d9883f9c36fad0ef85e0885ee4':
Add lock before calling initEglImage

commit | commitdiff | tree

Jason Sams [Wed, 27 Apr 2011 20:20:39 +0000 (13:20 -0700)]

Merge "Cleanup rs.spec file and code generator."

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:20:16 +0000 (13:20 -0700)]

Merge "Auto hide virtual keyboard"

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:14:57 +0000 (13:14 -0700)]

Merge "onDetachedFromWindow is called before onAttachedToWindow"

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 20:06:46 +0000 (13:06 -0700)]

Merge changes I0ab47e2f,Ib8016996

* changes:
Remove errant tag terminator
Normalize output of XMLtree content

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 19:46:09 +0000 (12:46 -0700)]

am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"

* commit 'f0556bb90ff38be96c6099f5efafe386cd7f1083':
Add lock before calling initEglImage

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 19:43:19 +0000 (12:43 -0700)]

am 86d1d747: Merge "Add lock before calling initEglImage"

* commit '86d1d74762e65b6f64c2d4758aa5fd4af6275696':
Add lock before calling initEglImage

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 19:28:05 +0000 (12:28 -0700)]

Merge "Add lock before calling initEglImage"

commit | commitdiff | tree

Gloria Wang [Wed, 27 Apr 2011 19:27:05 +0000 (12:27 -0700)]

am d84df054: am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit 'd84df05490e8b102e81cca848f65c174398be1b6':
Add heartbeat error codes into MediaErrors.h

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 19:24:58 +0000 (12:24 -0700)]

am b54bebf4: am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit 'b54bebf47fcd1cfbfdccd67e062d856ec06ce825':
Fix for startup NPE.

commit | commitdiff | tree

Gloria Wang [Wed, 27 Apr 2011 19:24:42 +0000 (12:24 -0700)]

am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit '969749319ca17f6e0c6836303a78cc484df2539b':
Add heartbeat error codes into MediaErrors.h

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 19:21:50 +0000 (12:21 -0700)]

am 470239a0: am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit '470239a0904a439b0364ef2ae6d85e8811c90d36':
Fix for startup NPE.

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 19:18:03 +0000 (12:18 -0700)]

am 30d59fa9: Ignore fix for startup NPE as file is deleted.

* commit '30d59fa90ffa1f19674f21596175ccb5fd8febd2':
Fix for startup NPE.

commit | commitdiff | tree

Gloria Wang [Wed, 27 Apr 2011 19:11:49 +0000 (12:11 -0700)]

am 83ddcdf7: Add heartbeat error codes into MediaErrors.h

* commit '83ddcdf7fdd46b81a2b0ea5acdf9b9dc52b5daa6':
Add heartbeat error codes into MediaErrors.h

commit | commitdiff | tree

Svetoslav Ganov [Wed, 27 Apr 2011 19:11:01 +0000 (12:11 -0700)]

Merge "The accessibility input filter state was not unregistered when no spoken feedback accessibility services are regitstered."

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 19:09:31 +0000 (12:09 -0700)]

Ignore fix for startup NPE as file is deleted.

Change-Id: Ifcedb4cc14b7079b03f585218c8c29b8f5d96d20

commit | commitdiff | tree

Alex Sakhartchouk [Wed, 27 Apr 2011 19:08:59 +0000 (12:08 -0700)]

Merge "Better workaround for the bitmap invalidation problem."

commit | commitdiff | tree

Conley Owens [Wed, 27 Apr 2011 18:40:46 +0000 (11:40 -0700)]

Merge "Fix for startup NPE."

commit | commitdiff | tree

Guang Zhu [Wed, 27 Apr 2011 18:05:28 +0000 (11:05 -0700)]

Merge "Make DRT pull data over network"

commit | commitdiff | tree

John Reck [Wed, 27 Apr 2011 17:46:39 +0000 (10:46 -0700)]

Merge "Add support for force-enabling zoom"

commit | commitdiff | tree

Bjorn Bringert [Wed, 27 Apr 2011 08:16:21 +0000 (01:16 -0700)]

Merge "Expose TTS engine API"

commit | commitdiff | tree

Adam Powell [Wed, 27 Apr 2011 01:38:23 +0000 (18:38 -0700)]

Merge "Fix overlay action bar decor layout for lower context mode area."

commit | commitdiff | tree

Nick Pelly [Wed, 27 Apr 2011 01:11:02 +0000 (18:11 -0700)]

am 3fa53e44: am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit '3fa53e448a4b2255f6ed14f8b8355ac2ee3379e9':
Implement dead service recovery in NFC extras library.

commit | commitdiff | tree

Nick Pelly [Wed, 27 Apr 2011 01:09:02 +0000 (18:09 -0700)]

am 36e6c4c1: am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit '36e6c4c1940f816df6c7745458f8c6bcca643701':
Implement dead service recovery in NFC extras library.

commit | commitdiff | tree

Mathias Agopian [Wed, 27 Apr 2011 01:05:23 +0000 (18:05 -0700)]

Merge "Report errors when eglCreateImageKHR fails"

commit | commitdiff | tree

Nick Pelly [Wed, 27 Apr 2011 01:04:02 +0000 (18:04 -0700)]

am cc9ee72b: Implement dead service recovery in NFC extras library.

* commit 'cc9ee72bd42bb40b1852f907f58305adde12ecc2':
Implement dead service recovery in NFC extras library.

commit | commitdiff | tree

Xia Wang [Wed, 27 Apr 2011 00:03:05 +0000 (17:03 -0700)]

Merge "- Add instrumentation utility to automate rs performance tests: The RsBench test activity can be launched within instrumentation"

commit | commitdiff | tree

Eric Fischer [Tue, 26 Apr 2011 23:19:04 +0000 (16:19 -0700)]

Merge "Import revised translations."

commit | commitdiff | tree

Conley Owens [Tue, 26 Apr 2011 23:06:19 +0000 (16:06 -0700)]

am ca15bf7a: am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit 'ca15bf7ae0e55057d3eafabe5f97fe81bb3dcf26':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)

commit | commitdiff | tree

Conley Owens [Tue, 26 Apr 2011 23:01:13 +0000 (16:01 -0700)]

am 54a952c8: am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit '54a952c84317afc64034ded8baad3d788a54026d':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)

commit | commitdiff | tree

Conley Owens [Tue, 26 Apr 2011 22:50:33 +0000 (15:50 -0700)]

am bf4769c7: am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit 'bf4769c7da5dd39499c2c5dc4413a7f5d6ad88a5':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)

commit | commitdiff | tree

Conley Owens [Tue, 26 Apr 2011 22:46:32 +0000 (15:46 -0700)]

am 17ba30b5: Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

* commit '17ba30b549a847f3aab854173a9484851f694453':
Load mnc/mcc configuration value from SIM (KDDI-CDMA)

commit | commitdiff | tree

Romain Guy [Tue, 26 Apr 2011 22:35:27 +0000 (15:35 -0700)]

Merge "Apply shaders/filters to text drop shadows. Bug #4318323"

commit | commitdiff | tree

Mathias Agopian [Tue, 26 Apr 2011 21:57:40 +0000 (14:57 -0700)]

Report errors when eglCreateImageKHR fails

Change-Id: Ica39b72ac2505675e619ef4994bd67b98bf6e7da

commit | commitdiff | tree

Conley Owens [Tue, 26 Apr 2011 21:36:48 +0000 (14:36 -0700)]

Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"

commit | commitdiff | tree

Romain Guy [Tue, 26 Apr 2011 21:04:59 +0000 (14:04 -0700)]

Merge "Update shader text to test with drop shadows."

commit | commitdiff | tree

Stephen Hines [Tue, 26 Apr 2011 20:45:51 +0000 (13:45 -0700)]

Merge "Start ICS header cleanup and finish type matrix."

commit | commitdiff | tree

Kenny Root [Tue, 26 Apr 2011 19:46:04 +0000 (12:46 -0700)]

am fbb0e9f9: am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

* commit 'fbb0e9f9846e185ba8ded63d754c4e61b1499b90':
libutils: Fix an improper const-cast in RefBase

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 26 Apr 2011 19:45:52 +0000 (12:45 -0700)]

am 31418a1e: am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

* commit '31418a1e9b905593587d8bf7a4705429db549d97':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.

commit | commitdiff | tree

Irfan Sheriff [Tue, 26 Apr 2011 19:45:28 +0000 (12:45 -0700)]

am 4e1027e4: am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework

* commit '4e1027e45dbe292b1bdcbd3500b20f00618303f4':
Handle DHCP renewal and wakeup in framework

commit | commitdiff | tree

Scott Main [Tue, 26 Apr 2011 19:45:15 +0000 (12:45 -0700)]

am 1786fdda: am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758

* commit '1786fddabeeffcceede702005839d9544188bc33':
docs: update a couple usb driver URLs bug: 4339758

commit | commitdiff | tree

Eric Laurent [Tue, 26 Apr 2011 19:44:53 +0000 (12:44 -0700)]

am 48dca4de: am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume

* commit '48dca4de70890d324b5830a58bb9fa273164151a':
Fix issue 4335692: HDMI media volume

commit | commitdiff | tree

Kenny Root [Tue, 26 Apr 2011 18:45:46 +0000 (11:45 -0700)]

am bb93dad9: am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

* commit 'bb93dad9250c0ee8330ab37bbdcd2eb8bfc0f930':
libutils: Fix an improper const-cast in RefBase

commit | commitdiff | tree

Kenny Root [Tue, 26 Apr 2011 18:41:31 +0000 (11:41 -0700)]

am bb10986c: am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

* commit 'bb10986c3d7493eaa3cd16042c8e6dae4769a071':
libutils: Fix an improper const-cast in RefBase

commit | commitdiff | tree

Kenny Root [Tue, 26 Apr 2011 18:32:22 +0000 (11:32 -0700)]

am 13ce221e: Merge "libutils: Fix an improper const-cast in RefBase"

* commit '13ce221e4316f7956ba072e774a7b97646e5d99b':
libutils: Fix an improper const-cast in RefBase

commit | commitdiff | tree

Kenny Root [Tue, 26 Apr 2011 18:26:33 +0000 (11:26 -0700)]

Merge "libutils: Fix an improper const-cast in RefBase"

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 26 Apr 2011 17:24:27 +0000 (10:24 -0700)]

am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

* commit '45e13ec1c5cd765162b7450b1c3a4632e8979894':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.

commit | commitdiff | tree

Marco Nelissen [Tue, 26 Apr 2011 16:37:57 +0000 (09:37 -0700)]

Merge "Fix javadoc."

commit | commitdiff | tree

John Reck [Tue, 26 Apr 2011 16:31:48 +0000 (09:31 -0700)]

Merge "Adding capability to lookup many elements."

commit | commitdiff | tree

Irfan Sheriff [Tue, 26 Apr 2011 15:54:54 +0000 (08:54 -0700)]

am 78d4e71d: (-s ours) am d2127c43: Handle DHCP renewal and wakeup in framework

* commit '78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9':
Handle DHCP renewal and wakeup in framework

commit | commitdiff | tree

Robert Greenwalt [Tue, 26 Apr 2011 08:35:39 +0000 (01:35 -0700)]

am 759efacd: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE

* commit '759efacd2d1cf70d10f66fb9656de656ac8ca867':
Make new networkAttribute parameter non-optional.

commit | commitdiff | tree

Ramesh Sudini [Tue, 26 Apr 2011 08:35:20 +0000 (01:35 -0700)]

am 9d5ac7bd: am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."

* commit '9d5ac7bd8ac92ac8fda2e1ac500438ffe6e3aa0f':
Telephony: Fix merge issue "Set enabled state before notification is sent out."

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 26 Apr 2011 08:20:37 +0000 (01:20 -0700)]

am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.

commit | commitdiff | tree

Scott Main [Tue, 26 Apr 2011 08:18:21 +0000 (01:18 -0700)]

am e20c91de: am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758

* commit 'e20c91de9ccb4a8cb76a8e72884f2e9ca001a2de':
docs: update a couple usb driver URLs bug: 4339758

commit | commitdiff | tree

Eric Laurent [Tue, 26 Apr 2011 08:14:07 +0000 (01:14 -0700)]

am 969357e3: am 223995dc: Fix issue 4335692: HDMI media volume

* commit '969357e31c93e168e7a4cb3b41c33a6ec26f4a26':
Fix issue 4335692: HDMI media volume

commit | commitdiff | tree

Scott Main [Tue, 26 Apr 2011 08:12:14 +0000 (01:12 -0700)]

am e1e3d7d9: am 97fee855: docs: update a couple usb driver URLs bug: 4339758

* commit 'e1e3d7d97caf89307230e85997f5d23074b216cb':
docs: update a couple usb driver URLs bug: 4339758

commit | commitdiff | tree

Irfan Sheriff [Tue, 26 Apr 2011 08:01:31 +0000 (01:01 -0700)]

am d2127c43: Handle DHCP renewal and wakeup in framework

* commit 'd2127c438fc858a4f6c8ad75b7a1e4491da69a78':
Handle DHCP renewal and wakeup in framework

commit | commitdiff | tree

Scott Main [Tue, 26 Apr 2011 07:45:35 +0000 (00:45 -0700)]

am 97fee855: docs: update a couple usb driver URLs bug: 4339758

* commit '97fee8554d40a8c093ef16934284d9292e4cf7a4':
docs: update a couple usb driver URLs bug: 4339758

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 26 Apr 2011 07:39:44 +0000 (00:39 -0700)]

am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.

commit | commitdiff | tree

Robert Greenwalt [Tue, 26 Apr 2011 07:23:03 +0000 (00:23 -0700)]

am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE

* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.

commit | commitdiff | tree

Ramesh Sudini [Tue, 26 Apr 2011 07:21:37 +0000 (00:21 -0700)]

am dcbba67a: Telephony: Fix merge issue "Set enabled state before notification is sent out."

* commit 'dcbba67afc08d0ac9af53e95d5997af11f869853':
Telephony: Fix merge issue "Set enabled state before notification is sent out."

commit | commitdiff | tree

Eric Laurent [Tue, 26 Apr 2011 07:19:34 +0000 (00:19 -0700)]

am 223995dc: Fix issue 4335692: HDMI media volume

* commit '223995dcf28aca2399258951a59559a7ae318ceb':
Fix issue 4335692: HDMI media volume