OSDN Git Service
Mathias Agopian [Thu, 28 Apr 2011 02:01:01 +0000 (19:01 -0700)]
Merge "Fix uninitialized variable in SurfaceTexture"
Mathias Agopian [Thu, 28 Apr 2011 01:57:33 +0000 (18:57 -0700)]
Fix uninitialized variable in SurfaceTexture
Change-Id: Ie77cdad481fc0522ff5ea3b7e14ce94e07150793
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
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
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
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
Conley Owens [Wed, 27 Apr 2011 23:49:07 +0000 (16:49 -0700)]
Ignore xml change since file no longer exists
Gilles Debunne [Wed, 27 Apr 2011 23:01:30 +0000 (16:01 -0700)]
Merge "Support for overlapping spans in TextView's suggestions."
Gilles Debunne [Wed, 27 Apr 2011 23:00:57 +0000 (16:00 -0700)]
Merge "Typo in TextAppearanceSpan documentation"
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."
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
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
Chet Haase [Wed, 27 Apr 2011 21:26:40 +0000 (14:26 -0700)]
Merge "Fix various hw-accelerated line/point bugs"
Romain Guy [Wed, 27 Apr 2011 21:23:36 +0000 (14:23 -0700)]
Merge "Correctly compute tex coords for rect layers. Bug #
4192695"
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
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
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
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
Jason Sams [Wed, 27 Apr 2011 20:20:39 +0000 (13:20 -0700)]
Merge "Cleanup rs.spec file and code generator."
Conley Owens [Wed, 27 Apr 2011 20:14:57 +0000 (13:14 -0700)]
Merge "onDetachedFromWindow is called before onAttachedToWindow"
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
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
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
Conley Owens [Wed, 27 Apr 2011 19:28:05 +0000 (12:28 -0700)]
Merge "Add lock before calling initEglImage"
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
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.
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
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.
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.
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
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."
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
Alex Sakhartchouk [Wed, 27 Apr 2011 19:08:59 +0000 (12:08 -0700)]
Merge "Better workaround for the bitmap invalidation problem."
Conley Owens [Wed, 27 Apr 2011 18:40:46 +0000 (11:40 -0700)]
Merge "Fix for startup NPE."
Guang Zhu [Wed, 27 Apr 2011 18:05:28 +0000 (11:05 -0700)]
Merge "Make DRT pull data over network"
John Reck [Wed, 27 Apr 2011 17:46:39 +0000 (10:46 -0700)]
Merge "Add support for force-enabling zoom"
Bjorn Bringert [Wed, 27 Apr 2011 08:16:21 +0000 (01:16 -0700)]
Merge "Expose TTS engine API"
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."
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.
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.
Mathias Agopian [Wed, 27 Apr 2011 01:05:23 +0000 (18:05 -0700)]
Merge "Report errors when eglCreateImageKHR fails"
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.
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"
Eric Fischer [Tue, 26 Apr 2011 23:19:04 +0000 (16:19 -0700)]
Merge "Import revised translations."
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)
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)
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)
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)
Romain Guy [Tue, 26 Apr 2011 22:35:27 +0000 (15:35 -0700)]
Merge "Apply shaders/filters to text drop shadows. Bug #
4318323"
Mathias Agopian [Tue, 26 Apr 2011 21:57:40 +0000 (14:57 -0700)]
Report errors when eglCreateImageKHR fails
Change-Id: Ica39b72ac2505675e619ef4994bd67b98bf6e7da
Conley Owens [Tue, 26 Apr 2011 21:36:48 +0000 (14:36 -0700)]
Merge "Load mnc/mcc configuration value from SIM (KDDI-CDMA)"
Romain Guy [Tue, 26 Apr 2011 21:04:59 +0000 (14:04 -0700)]
Merge "Update shader text to test with drop shadows."
Stephen Hines [Tue, 26 Apr 2011 20:45:51 +0000 (13:45 -0700)]
Merge "Start ICS header cleanup and finish type matrix."
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
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.
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
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
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
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
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
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
Kenny Root [Tue, 26 Apr 2011 18:26:33 +0000 (11:26 -0700)]
Merge "libutils: Fix an improper const-cast in RefBase"
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.
Marco Nelissen [Tue, 26 Apr 2011 16:37:57 +0000 (09:37 -0700)]
Merge "Fix javadoc."
John Reck [Tue, 26 Apr 2011 16:31:48 +0000 (09:31 -0700)]
Merge "Adding capability to lookup many elements."
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
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.
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."
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.
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
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
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
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
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
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.
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.
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."
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
Mathias Agopian [Tue, 26 Apr 2011 05:59:51 +0000 (22:59 -0700)]
Merge "fix typo in Vector<>:: push_back and push_front"
Mathias Agopian [Tue, 26 Apr 2011 05:56:54 +0000 (22:56 -0700)]
fix typo in Vector<>:: push_back and push_front
parameter were inverted.
Change-Id: I867b01de5f58354bb9668fa662dd2a7d78dd3b37
James Dong [Tue, 26 Apr 2011 04:54:56 +0000 (21:54 -0700)]
Merge "Give PSP and QuickTime compatible mp4 files a chance to play"
James Dong [Tue, 26 Apr 2011 04:54:46 +0000 (21:54 -0700)]
Merge "Fix memory leak from retrieval of getSupportedDrmInfo."
Fabrice Di Meglio [Tue, 26 Apr 2011 01:07:24 +0000 (18:07 -0700)]
Merge "Fix bug #
4338103 (Android Arabic and Hebrew input is broken)"
Adam Powell [Tue, 26 Apr 2011 00:44:22 +0000 (17:44 -0700)]
Merge "Action bar work for phones"
Mike Lockwood [Tue, 26 Apr 2011 00:42:39 +0000 (17:42 -0700)]
Merge "MTP: Implement GetThumb command"
Adam Powell [Tue, 26 Apr 2011 00:19:59 +0000 (17:19 -0700)]
Merge "Only set the accelerated drawable state for views when the hardware renderer is available."
Jamie Gennis [Tue, 26 Apr 2011 00:00:19 +0000 (17:00 -0700)]
Merge "EGL: Allow creating a SurfaceTexture EGLSurface."
Mathias Agopian [Mon, 25 Apr 2011 23:58:01 +0000 (16:58 -0700)]
Merge "libgui: Fix the tests so they build."
Jamie Gennis [Mon, 25 Apr 2011 23:41:11 +0000 (16:41 -0700)]
EGL: Allow creating a SurfaceTexture EGLSurface.
This change removes the check that disallowed the creation of an
EGLSurface that would send frames to a SurfaceTexture.
Change-Id: I44c6d5df503cc676a88144d72d39b414692ce4c9
Jamie Gennis [Mon, 25 Apr 2011 23:40:05 +0000 (16:40 -0700)]
libgui: Fix the tests so they build.
Change-Id: I7205b0819e5801ac549109ff562c3ab1b113d176
Robert Greenwalt [Mon, 25 Apr 2011 23:19:30 +0000 (16:19 -0700)]
Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
Mathias Agopian [Mon, 25 Apr 2011 22:29:40 +0000 (15:29 -0700)]
Merge "Add some basic STL compatibility to Vector<>"
Mathias Agopian [Mon, 25 Apr 2011 22:28:17 +0000 (15:28 -0700)]
Add some basic STL compatibility to Vector<>
Change-Id: Iaf72623170ee415372c7989d7ba9ff627167449e
Robert Greenwalt [Mon, 25 Apr 2011 22:05:24 +0000 (15:05 -0700)]
Merge "Expose more net types to the public."
Chet Haase [Mon, 25 Apr 2011 21:51:48 +0000 (14:51 -0700)]
Merge "Minor cleanup in GLrenderer code"
Mike Lockwood [Mon, 25 Apr 2011 20:37:44 +0000 (13:37 -0700)]
Merge "MTP: Fix file descriptor leak in file editing extensions"
Jean-Baptiste Queru [Mon, 25 Apr 2011 20:33:37 +0000 (13:33 -0700)]
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
Chet Haase [Mon, 25 Apr 2011 19:56:34 +0000 (12:56 -0700)]
Merge "Fix bitfield bug with vertex shader selection"
James Dong [Mon, 25 Apr 2011 17:21:43 +0000 (10:21 -0700)]
Merge "Return status code from invoke()"
Mike Lockwood [Mon, 25 Apr 2011 16:52:26 +0000 (09:52 -0700)]
Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"
OSDN Git Service
