OSDN Git Service
Andreas Huber [Thu, 9 Feb 2012 22:52:58 +0000 (14:52 -0800)]
Merge "Experiment with seeking to closest frame instead of closest syncframe"
Joe Fernandez [Thu, 9 Feb 2012 21:51:00 +0000 (13:51 -0800)]
am
4f21e3a0: am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
4f21e3a08adefbb5e109e2f844386ed844c1c436':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:48:46 +0000 (13:48 -0800)]
am
20b9c795: am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:46:41 +0000 (13:46 -0800)]
am
1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
* commit '
1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)
Joe Fernandez [Thu, 9 Feb 2012 21:45:01 +0000 (13:45 -0800)]
Merge "docs: OpenGL Tutorials fixed two broken links (Issue
5990696, public android bug: 25132)" into ics-mr1
Scott Main [Thu, 9 Feb 2012 20:53:12 +0000 (12:53 -0800)]
am
ec12ae99: am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
ec12ae9933e463181338834387caa7c58b330635':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:50:18 +0000 (12:50 -0800)]
am
79cfde69: am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
docs: fix misc doc bugs from external issue tracker
Scott Main [Thu, 9 Feb 2012 20:48:08 +0000 (12:48 -0800)]
am
52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '
52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
Eric Fischer [Thu, 9 Feb 2012 19:37:18 +0000 (11:37 -0800)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 9 Feb 2012 19:26:02 +0000 (11:26 -0800)]
Merge "Import translations. DO NOT MERGE"
Dianne Hackborn [Thu, 9 Feb 2012 19:20:07 +0000 (11:20 -0800)]
Merge "Add new feature for running services in "isolated" sandbox processes."
Jamie Gennis [Thu, 9 Feb 2012 19:08:02 +0000 (11:08 -0800)]
Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
Steve Block [Thu, 9 Feb 2012 11:04:49 +0000 (03:04 -0800)]
Merge "Clarify comments for WebSettings."
Justin Ho [Wed, 8 Feb 2012 20:59:17 +0000 (12:59 -0800)]
Merge "Tentative fix for mysteriously recycled bitmap"
Dianne Hackborn [Wed, 8 Feb 2012 19:38:23 +0000 (11:38 -0800)]
Merge "Don't wait for current activity to pause before resuming next."
James Dong [Wed, 8 Feb 2012 18:42:35 +0000 (10:42 -0800)]
Merge "Enable B frame support in MPEG4Writer"
Glenn Kasten [Wed, 8 Feb 2012 18:27:58 +0000 (10:27 -0800)]
Merge "Combine duplicate code & document wp<> in mClients"
Gilles Debunne [Wed, 8 Feb 2012 18:27:46 +0000 (10:27 -0800)]
Merge "Invalidate text display list when text properties change."
Glenn Kasten [Wed, 8 Feb 2012 18:22:11 +0000 (10:22 -0800)]
Merge "Use audio_io_handle_t consistently instead of int"
Marco Nelissen [Wed, 8 Feb 2012 18:15:01 +0000 (10:15 -0800)]
Merge "Delete entries in bulk"
Glenn Kasten [Wed, 8 Feb 2012 17:37:26 +0000 (09:37 -0800)]
Merge "Effect UUID inputs passed by pointer are const"
Wink Saville [Wed, 8 Feb 2012 17:19:19 +0000 (09:19 -0800)]
Merge "Add ril.test.emergency system property."
Glenn Kasten [Wed, 8 Feb 2012 16:40:28 +0000 (08:40 -0800)]
Merge "Use pid_t not int"
Glenn Kasten [Wed, 8 Feb 2012 16:40:15 +0000 (08:40 -0800)]
Merge "Don't double destruct audio_track_cblk_t"
Glenn Kasten [Wed, 8 Feb 2012 16:39:39 +0000 (08:39 -0800)]
Merge "AudioFlinger methods const and inline"
Glenn Kasten [Wed, 8 Feb 2012 16:34:33 +0000 (08:34 -0800)]
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
Glenn Kasten [Wed, 8 Feb 2012 16:33:41 +0000 (08:33 -0800)]
Merge "Use virtual destructors"
Glenn Kasten [Wed, 8 Feb 2012 15:45:15 +0000 (07:45 -0800)]
Merge "Improve performance for sp<> on stack"
Glenn Kasten [Wed, 8 Feb 2012 15:42:40 +0000 (07:42 -0800)]
Merge "AudioTrack declare more methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:41:44 +0000 (07:41 -0800)]
Merge "Use 0 not NULL for sp<> and wp<>"
Glenn Kasten [Wed, 8 Feb 2012 15:40:23 +0000 (07:40 -0800)]
Merge "Use bool instead of int"
Glenn Kasten [Wed, 8 Feb 2012 15:39:27 +0000 (07:39 -0800)]
Merge "Declare more IAudioFlinger methods const"
Glenn Kasten [Wed, 8 Feb 2012 15:38:42 +0000 (07:38 -0800)]
Merge "Remove dead code"
Scott Main [Wed, 8 Feb 2012 05:52:27 +0000 (21:52 -0800)]
Scott Main [Wed, 8 Feb 2012 05:52:24 +0000 (21:52 -0800)]
am
f8274e50: am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
f8274e506c1e4ef798554244370daf57cc88ecdb':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:50:20 +0000 (21:50 -0800)]
Scott Main [Wed, 8 Feb 2012 05:49:37 +0000 (21:49 -0800)]
am
8561a6b0: am
09ff04d7: docs: fix typo in menu TOC
* commit '
8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:48:03 +0000 (21:48 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Scott Main [Wed, 8 Feb 2012 05:47:38 +0000 (21:47 -0800)]
am
09ff04d7: docs: fix typo in menu TOC
* commit '
09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
Guang Zhu [Wed, 8 Feb 2012 03:42:07 +0000 (19:42 -0800)]
Merge "Revert "Make NDC not block forever and handle restart.""
Jason Sams [Wed, 8 Feb 2012 02:56:39 +0000 (18:56 -0800)]
Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
Romain Guy [Wed, 8 Feb 2012 02:22:43 +0000 (18:22 -0800)]
Merge "Fix the system"
Fabrice Di Meglio [Wed, 8 Feb 2012 01:49:47 +0000 (17:49 -0800)]
Merge "Fix bug #
5979311 Change TextView to not clip top/bottom text"
Romain Guy [Wed, 8 Feb 2012 01:07:00 +0000 (17:07 -0800)]
Merge "Preliminary support for clipRect(Rect, Op)"
Romain Guy [Wed, 8 Feb 2012 01:04:34 +0000 (17:04 -0800)]
Preliminary support for clipRect(Rect, Op)
This adds basic support for clip regions. It is currently disabled at compile
time. Enabling clip regions will require setting up a stencil buffer.
Change-Id: I638616a972276e38737f8ac0633692c3845eaa74
Robert Greenwalt [Wed, 8 Feb 2012 00:19:56 +0000 (16:19 -0800)]
Merge "Make NDC not block forever and handle restart."
Wink Saville [Tue, 7 Feb 2012 23:56:23 +0000 (15:56 -0800)]
Merge "Fix INTENT_RECONNECT_ALARM_EXTRA_xx, make strings meaningful."
Jeff Sharkey [Tue, 7 Feb 2012 23:50:02 +0000 (15:50 -0800)]
Merge "Send broadcast when changing restrict background."
Jason Sams [Tue, 7 Feb 2012 23:39:44 +0000 (15:39 -0800)]
Merge "Implement RS VSync on new vsync infrastructure."
Daniel Lam [Sun, 22 Jan 2012 23:26:27 +0000 (15:26 -0800)]
Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue.
Change-Id: I514f6b802f6b49c9ae27bed37bf0b9d23da03c9a
Dianne Hackborn [Tue, 7 Feb 2012 21:46:46 +0000 (13:46 -0800)]
Merge "Return information about whether overlays are disabled."
Dianne Hackborn [Tue, 7 Feb 2012 21:46:28 +0000 (13:46 -0800)]
Merge "Only generate private symbols that are needed."
Svetoslav Ganov [Tue, 7 Feb 2012 20:07:23 +0000 (12:07 -0800)]
Merge "Adding a method for retching the root node in UiTestAutomationBridge"
Jeff Sharkey [Tue, 7 Feb 2012 18:45:41 +0000 (10:45 -0800)]
Merge "List rotated netstats files during --checkin dump."
Andreas Huber [Tue, 7 Feb 2012 18:43:08 +0000 (10:43 -0800)]
Merge "MatroskaExtractor: to support MPEG4 and MP3 codec."
The Android Open Source Project [Tue, 7 Feb 2012 18:23:12 +0000 (10:23 -0800)]
The Android Open Source Project [Tue, 7 Feb 2012 18:21:31 +0000 (10:21 -0800)]
am
1bd8111b: Reconcile with ics-mr1-release
* commit '
1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
The Android Open Source Project [Tue, 7 Feb 2012 18:18:32 +0000 (10:18 -0800)]
Reconcile with ics-mr1-release
Change-Id: I628448f7b618988e20f7dfdf58c53133874a3958
The Android Open Source Project [Tue, 7 Feb 2012 18:12:59 +0000 (10:12 -0800)]
am
01383571: am
07bebe8b: Reconcile with ics-mr1-release
* commit '
0138357198244b5bda242e248ed98040622ea5af':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:11:11 +0000 (10:11 -0800)]
am
07bebe8b: Reconcile with ics-mr1-release
* commit '
07bebe8b12555ea0fb57729e8ee2e7efc343e7e2':
Don't use SNR in the invalid check.
The Android Open Source Project [Tue, 7 Feb 2012 18:09:07 +0000 (10:09 -0800)]
Reconcile with ics-mr1-release
Change-Id: Iff5f4c5cc26a9b874bef31bd62d22d3b210dc74f
Marco Nelissen [Tue, 7 Feb 2012 16:28:02 +0000 (08:28 -0800)]
Merge "Make media scanner use new delete-parameter"
Dianne Hackborn [Tue, 7 Feb 2012 05:21:05 +0000 (21:21 -0800)]
Return information about whether overlays are disabled.
Change-Id: I85ae42e9f28461f5142cc6b3c8e25ff3f195805a
Mathias Agopian [Tue, 7 Feb 2012 03:18:57 +0000 (19:18 -0800)]
Merge "make sure to ignore SIGPIPE in the write side of BitTube"
Mathias Agopian [Tue, 7 Feb 2012 03:10:04 +0000 (19:10 -0800)]
make sure to ignore SIGPIPE in the write side of BitTube
Change-Id: If4f037f4403d3ecbcd5f91248354765fc0fa13cb
Xavier Ducrohet [Tue, 7 Feb 2012 02:07:21 +0000 (18:07 -0800)]
Merge "Fix a setBackgroundDrawable in layoutlib."
Fabrice Di Meglio [Tue, 7 Feb 2012 01:22:06 +0000 (17:22 -0800)]
Merge "Fix bug #
5968466 system running out of memory during WebView performance test"
Fabrice Di Meglio [Tue, 7 Feb 2012 01:21:40 +0000 (17:21 -0800)]
Merge "Update BiDiTest app for adding GridLayout unit tests"
John Wang [Tue, 7 Feb 2012 01:06:18 +0000 (17:06 -0800)]
am
a0da8adf: am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
a0da8adf5519d0660d6f0f44e7f91b99d6b741d9':
John Wang [Tue, 7 Feb 2012 01:06:16 +0000 (17:06 -0800)]
am
7e6295b3: am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
7e6295b32310afddccf5fb030d4c475ed3678e0f':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:04:42 +0000 (17:04 -0800)]
am
397d3ffc: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
397d3ffcbd27d10b9479e58a46ca6ba70838b697':
Craig Mautner [Tue, 7 Feb 2012 01:04:23 +0000 (17:04 -0800)]
Merge "Extract code from performLayoutAndPlaceSurfacesInnerLocked() into multiple methods."
John Wang [Tue, 7 Feb 2012 01:04:11 +0000 (17:04 -0800)]
am
9ad528d5: am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
9ad528d51c6e7b56e018100897b3c1cd6f9a2c17':
Don't use SNR in the invalid check.
Tom Taylor [Tue, 7 Feb 2012 01:03:34 +0000 (17:03 -0800)]
Merge "CrespoMMS appears after delay in the thread"
John Wang [Tue, 7 Feb 2012 01:03:15 +0000 (17:03 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:02:30 +0000 (17:02 -0800)]
am
48ac0f14: Merge "Don\'t use SNR in the invalid check." into ics-mr1
* commit '
48ac0f14de9be4c91bdce4e601c5eef4fd2c3123':
Don't use SNR in the invalid check.
John Wang [Tue, 7 Feb 2012 01:00:49 +0000 (17:00 -0800)]
Merge "Don't use SNR in the invalid check." into ics-mr1
Xavier Ducrohet [Tue, 7 Feb 2012 00:48:55 +0000 (16:48 -0800)]
am
82a74bbe: (-s ours) am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
82a74bbe91b7e90ec2fca56650e3d55ebdedeac2':
Xavier Ducrohet [Tue, 7 Feb 2012 00:46:46 +0000 (16:46 -0800)]
am
c9bcd33a: (-s ours) am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
c9bcd33afa5c34e0a49955c30aa875ac8205b65f':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:45:21 +0000 (16:45 -0800)]
am
82fc005f: am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
82fc005f579a20b3c7e63603f056ca095c288196':
Xavier Ducrohet [Tue, 7 Feb 2012 00:44:32 +0000 (16:44 -0800)]
am
b1f95c6a: (-s ours) am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
b1f95c6a938f6eaaa7a3fd28574a14647178059b':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:56 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
Xavier Ducrohet [Tue, 7 Feb 2012 00:42:41 +0000 (16:42 -0800)]
am
331bb0c3: Setup ActionBars in layoutlib the same way the platform does it. do not merge.
* commit '
331bb0c393d5e2ea2485102dcddbb8c2d42654d2':
Setup ActionBars in layoutlib the same way the platform does it. do not merge.
James Dong [Tue, 7 Feb 2012 00:21:24 +0000 (16:21 -0800)]
Merge "Don't call virtual function in destructor of SurfaceMediaSource"
Xavier Ducrohet [Tue, 7 Feb 2012 00:17:42 +0000 (16:17 -0800)]
Merge "Setup ActionBars in layoutlib the same way the platform does it. do not merge."
Xavier Ducrohet [Mon, 6 Feb 2012 23:52:58 +0000 (15:52 -0800)]
Merge "Setup ActionBars in layoutlib the same way the platform does it."
Amith Yamasani [Mon, 6 Feb 2012 23:39:40 +0000 (15:39 -0800)]
Merge "Check for null ActivityInfo."
Mangesh Ghiware [Mon, 6 Feb 2012 23:27:08 +0000 (15:27 -0800)]
Merge "Use WebKit hit testing result for centering on double-tap zoom."
Scott Main [Mon, 6 Feb 2012 22:45:41 +0000 (14:45 -0800)]
am
f9bb376b: am
afaec576: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
f9bb376bd7bfb6bdc77e1621a340122c29afd21c':
Scott Main [Mon, 6 Feb 2012 22:45:39 +0000 (14:45 -0800)]
am
dbee29ba: am
5a0fe6fc: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
dbee29ba559a0c16919b5977ed4972481b0a98ec':
docs: switch from caps to initial-case for device button names
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:45:36 +0000 (14:45 -0800)]
am
33476f7a: am
f79bcd2d: am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
33476f7ad1c3b4dcaefddb306f315e201c4efb33':
Skia API changes as a result of an update to the Skia library.
Scott Main [Mon, 6 Feb 2012 22:15:06 +0000 (14:15 -0800)]
am
afaec576: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
afaec57668551b797505f43d9d9677979dedf0c9':
Scott Main [Mon, 6 Feb 2012 22:14:09 +0000 (14:14 -0800)]
am
5a0fe6fc: am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
5a0fe6fc13bc1102fbc3da8391dd228ed54bba04':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:12:39 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:12:05 +0000 (14:12 -0800)]
am
f79bcd2d: am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
f79bcd2dd5d82376640661f50aa2e9237af7c02c':
Skia API changes as a result of an update to the Skia library.
Scott Main [Mon, 6 Feb 2012 22:12:03 +0000 (14:12 -0800)]
am
a9d9fa72: Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
* commit '
a9d9fa723a10ae41c047a4e8eba330112d344dc8':
docs: switch from caps to initial-case for device button names
Scott Main [Mon, 6 Feb 2012 22:10:16 +0000 (14:10 -0800)]
Merge "docs: switch from caps to initial-case for device button names" into ics-mr1
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:09:36 +0000 (14:09 -0800)]
am
52da99fa: am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
52da99fac85d1e16a3c95bdd9c039801e920e6d1':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:07:31 +0000 (14:07 -0800)]
am
a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."
* commit '
a081c7b8bc5a3ea19fc7562b333fac525b17bc5f':
Skia API changes as a result of an update to the Skia library.
Jean-Baptiste Queru [Mon, 6 Feb 2012 22:01:05 +0000 (14:01 -0800)]
Merge "Skia API changes as a result of an update to the Skia library."
OSDN Git Service
