Scott Main
344a33a51f
am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
...
* commit 'ad231a303ee8fe7f8b51900d7b57971ab9963ad4':
docs: fix xss issue bug 5125642
2012-02-09 16:06:31 -08:00
Scott Main
68cda8cbaa
am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
...
* commit 'db7da7ee40231225861f4d39ea2f256bbca06f24':
docs: fix xss issue bug 5125642
2012-02-09 16:04:15 -08:00
Scott Main
e1eb4ca887
am d9c8bbd5: docs: fix xss issue bug 5125642
...
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
docs: fix xss issue bug 5125642
2012-02-09 16:01:51 -08:00
James Dong
9e4b89486e
Merge "Finish up B frame support in MPEG4Writer"
2012-02-09 15:22:58 -08:00
Jason Sams
7d67b4de2f
Merge "Remove unused param."
2012-02-09 15:17:27 -08:00
Andreas Huber
655c86a50a
Merge "Experiment with seeking to closest frame instead of closest syncframe"
2012-02-09 14:52:58 -08:00
Joe Fernandez
11d2747fdd
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)
2012-02-09 13:51:00 -08:00
Joe Fernandez
04398347b7
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)
2012-02-09 13:48:46 -08:00
Joe Fernandez
c4c313f8ca
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)
2012-02-09 13:46:41 -08:00
Joe Fernandez
8ec61aacd3
Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
2012-02-09 13:45:01 -08:00
Scott Main
4128e96175
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
2012-02-09 12:53:12 -08:00
Scott Main
5cfc0b29db
am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker
...
* commit '79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
docs: fix misc doc bugs from external issue tracker
2012-02-09 12:50:18 -08:00
Scott Main
fbf4f0cf02
am 52bfc243: docs: fix misc doc bugs from external issue tracker
...
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
docs: fix misc doc bugs from external issue tracker
2012-02-09 12:48:08 -08:00
Eric Fischer
10f5e63282
Merge "Import translations. DO NOT MERGE"
2012-02-09 11:37:18 -08:00
Eric Fischer
d2fa6e6a70
Merge "Import translations. DO NOT MERGE"
2012-02-09 11:26:02 -08:00
Dianne Hackborn
2bf030602f
Merge "Add new feature for running services in "isolated" sandbox processes."
2012-02-09 11:20:07 -08:00
Jamie Gennis
d94bb5c883
Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
2012-02-09 11:08:02 -08:00
Steve Block
de1ee07cae
Merge "Clarify comments for WebSettings."
2012-02-09 03:04:49 -08:00
Justin Ho
36d1a54ad5
Merge "Tentative fix for mysteriously recycled bitmap"
2012-02-08 12:59:17 -08:00
Dianne Hackborn
7d3e2484dd
Merge "Don't wait for current activity to pause before resuming next."
2012-02-08 11:38:23 -08:00
James Dong
1fb64cf678
Merge "Enable B frame support in MPEG4Writer"
2012-02-08 10:42:35 -08:00
Glenn Kasten
928f0f72e7
Merge "Combine duplicate code & document wp<> in mClients"
2012-02-08 10:27:58 -08:00
Gilles Debunne
2d92b3b2d6
Merge "Invalidate text display list when text properties change."
2012-02-08 10:27:46 -08:00
Glenn Kasten
05f21b75c4
Merge "Use audio_io_handle_t consistently instead of int"
2012-02-08 10:22:11 -08:00
Marco Nelissen
2c5fd304d9
Merge "Delete entries in bulk"
2012-02-08 10:15:01 -08:00
Glenn Kasten
8263b8fb9b
Merge "Effect UUID inputs passed by pointer are const"
2012-02-08 09:37:26 -08:00
Wink Saville
5777f7b31d
Merge "Add ril.test.emergency system property."
2012-02-08 09:19:19 -08:00
Glenn Kasten
3c1a823336
Merge "Use pid_t not int"
2012-02-08 08:40:28 -08:00
Glenn Kasten
e3c5e08ee1
Merge "Don't double destruct audio_track_cblk_t"
2012-02-08 08:40:15 -08:00
Glenn Kasten
ab76e39914
Merge "AudioFlinger methods const and inline"
2012-02-08 08:39:39 -08:00
Glenn Kasten
36293efd39
Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
2012-02-08 08:34:33 -08:00
Glenn Kasten
9edfab2c1d
Merge "Use virtual destructors"
2012-02-08 08:33:41 -08:00
Glenn Kasten
17fbbc078b
Merge "Improve performance for sp<> on stack"
2012-02-08 07:45:15 -08:00
Glenn Kasten
06d19c5101
Merge "AudioTrack declare more methods const"
2012-02-08 07:42:40 -08:00
Glenn Kasten
c1ad05d503
Merge "Use 0 not NULL for sp<> and wp<>"
2012-02-08 07:41:44 -08:00
Glenn Kasten
a4aa13cd31
Merge "Use bool instead of int"
2012-02-08 07:40:23 -08:00
Glenn Kasten
74de0ea599
Merge "Declare more IAudioFlinger methods const"
2012-02-08 07:39:27 -08:00
Glenn Kasten
7194b4b62c
Merge "Remove dead code"
2012-02-08 07:38:42 -08:00
Scott Main
d564282c23
am cc9dd9a6: am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
...
* commit 'cc9dd9a6373fef19fbfb40f0e09ac8016bc74e38':
2012-02-07 21:52:27 -08:00
Scott Main
41730fabfe
am f8274e50: am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
...
* commit 'f8274e506c1e4ef798554244370daf57cc88ecdb':
docs: fix typo in menu TOC
2012-02-07 21:52:24 -08:00
Scott Main
abe3a692b0
am 02beef84: am 09ff04d7: docs: fix typo in menu TOC
...
* commit '02beef8445fbf45b4dfc2472275dc5b49bb41a50':
2012-02-07 21:50:20 -08:00
Scott Main
8d2d215ec3
am 8561a6b0: am 09ff04d7: docs: fix typo in menu TOC
...
* commit '8561a6b0c5e0fbec7101108bf480f2adb485f2bc':
docs: fix typo in menu TOC
2012-02-07 21:49:37 -08:00
Scott Main
6301e33ebb
am 09ff04d7: docs: fix typo in menu TOC
...
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
2012-02-07 21:48:03 -08:00
Scott Main
aec806c78b
am 09ff04d7: docs: fix typo in menu TOC
...
* commit '09ff04d7893a9f49e478bb732ce1ea1b17662a3b':
docs: fix typo in menu TOC
2012-02-07 21:47:38 -08:00
Guang Zhu
809fda5d0a
Merge "Revert "Make NDC not block forever and handle restart.""
2012-02-07 19:42:07 -08:00
Jason Sams
bfcafeb2f3
Merge "Fix bug in generated code for functions with inband data from pointers. Passing zero length data would desync return command stream."
2012-02-07 18:56:39 -08:00
Romain Guy
d0e5466e26
Merge "Fix the system"
2012-02-07 18:22:43 -08:00
Fabrice Di Meglio
1824f6668e
Merge "Fix bug #5979311 Change TextView to not clip top/bottom text"
2012-02-07 17:49:47 -08:00
Romain Guy
626283434b
Merge "Preliminary support for clipRect(Rect, Op)"
2012-02-07 17:07:00 -08:00
Romain Guy
b8a2e98cd7
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
2012-02-07 17:04:34 -08:00
