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

Mathias Agopian [Tue, 29 Nov 2011 21:10:51 +0000 (13:10 -0800)]

am f9e88fbe: Fix build.

* commit 'f9e88fbee04f83638b07546741196bd4c242ef54':
Fix build.

Mathias Agopian [Tue, 29 Nov 2011 21:07:24 +0000 (13:07 -0800)]

Fix build.

Revert "Add support for sending VSYNC events to the framework"

This reverts commit f3918c5bd4bc9f02f74da42995564150ca2dd382.

Change-Id: I998e3e1aa3fa310829ae973b64fe11b01f6f468f

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 19:54:01 +0000 (11:54 -0800)]

am e11ec1df: am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

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

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 19:51:20 +0000 (11:51 -0800)]

am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '47af771d708c8eb8f7debf7e295d609491f03cc8':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Mathias Agopian [Tue, 29 Nov 2011 19:49:10 +0000 (11:49 -0800)]

am aa2892ed: Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8

* commit 'aa2892edc7bb2b915771679d9811ec54a26db366':
  Add support for sending VSYNC events to the framework
  BitTube::read now handles EAGAIN
  split ComposerService out of SurfaceComposerClient.h
  rewrite SF's message loop on top of Looper

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 19:47:08 +0000 (11:47 -0800)]

am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

* commit '9ab3c62499c054b600699fb107c28fc8926ca5a1':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Mathias Agopian [Tue, 29 Nov 2011 19:47:03 +0000 (11:47 -0800)]

Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8

* changes:
  Add support for sending VSYNC events to the framework
  BitTube::read now handles EAGAIN
  split ComposerService out of SurfaceComposerClient.h
  rewrite SF's message loop on top of Looper

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 19:44:59 +0000 (11:44 -0800)]

Merge "Import revised translations. DO NOT MERGE" into ics-mr1

commit | commitdiff | tree

Mathias Agopian [Fri, 18 Nov 2011 01:49:17 +0000 (17:49 -0800)]

Add support for sending VSYNC events to the framework

use gui/DisplayEvent to receive the events. Events are
dispatched through a unix pipe, so the API is compatible
with utils/Looper. see gui/DisplayEvent.h for more info.

Bug: 1475048
Change-Id: If4126023fc9c067e56087ec7d16a8fd542ce1794

commit | commitdiff | tree

Mathias Agopian [Tue, 29 Nov 2011 19:42:32 +0000 (11:42 -0800)]

BitTube::read now handles EAGAIN

Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8

commit | commitdiff | tree

Mathias Agopian [Tue, 29 Nov 2011 19:41:45 +0000 (11:41 -0800)]

am 1e773932: am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1

* commit '1e773932a1658128b80508f081de3c80655465d2':
temporarily hardcode Nexus S refresh rate

commit | commitdiff | tree

Mathias Agopian [Tue, 29 Nov 2011 19:39:49 +0000 (11:39 -0800)]

am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1

* commit 'db0bc7d46cacb6446deb7c59d39ce563846d7071':
temporarily hardcode Nexus S refresh rate

commit | commitdiff | tree

Mathias Agopian [Tue, 29 Nov 2011 19:36:54 +0000 (11:36 -0800)]

am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1

* commit '3f2730c5317700e3ae5412b5c825a747b591ebc2':
temporarily hardcode Nexus S refresh rate

commit | commitdiff | tree

Mathias Agopian [Tue, 29 Nov 2011 19:35:07 +0000 (11:35 -0800)]

Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 19:13:36 +0000 (11:13 -0800)]

am 9b426869: Merge "Import revised translations."

* commit '9b4268697f0254d21ae56d2b2a8fe190e3a43e79':
Import revised translations.

commit | commitdiff | tree

Eric Fischer [Tue, 29 Nov 2011 19:09:51 +0000 (11:09 -0800)]

Merge "Import revised translations."

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 18:22:18 +0000 (10:22 -0800)]

am 45c62be2: am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1

* commit '45c62be2bc553f603c9adadc60abff62ddedba79':
Fix issue #5642121: Proximity sensor didn't turn the screen on in call

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 18:20:03 +0000 (10:20 -0800)]

am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1

* commit 'e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba':
Fix issue #5642121: Proximity sensor didn't turn the screen on in call

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 18:17:42 +0000 (10:17 -0800)]

am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1

* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
Fix issue #5642121: Proximity sensor didn't turn the screen on in call

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 18:16:11 +0000 (10:16 -0800)]

Merge "Fix issue #5642121: Proximity sensor didn't turn the screen on in call" into ics-mr1

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:13:17 +0000 (10:13 -0800)]

am f96ccc17: am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1

* commit 'f96ccc175d1309749be5a8a6b748d316ab863086':
Cleanup references when turning BT off.

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:13:15 +0000 (10:13 -0800)]

am 9ab5ef27: am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1

* commit '9ab5ef2741e2eaeb44218d802643de81ddb4b7a1':
Cleanup static references when quitting.

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 18:11:06 +0000 (10:11 -0800)]

am c273cd31: Merge "Restoring mLayout has private in TextView"

* commit 'c273cd318d8bb45c22a914ba88d4cb4dd94a768e':
Restoring mLayout has private in TextView

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:09:40 +0000 (10:09 -0800)]

am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1

* commit 'f4e41c35387728720780935564a491cf9bf1357e':
Cleanup references when turning BT off.

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:09:38 +0000 (10:09 -0800)]

am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1

* commit '910ae39f8a12bcb917b7eb1da3f701925da79509':
Cleanup static references when quitting.

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 18:09:25 +0000 (10:09 -0800)]

Merge "Restoring mLayout has private in TextView"

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:09 +0000 (10:07 -0800)]

am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1

* commit 'eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
Cleanup references when turning BT off.

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:07:07 +0000 (10:07 -0800)]

am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1

* commit 'ff33b94e236fcde3833fba698d32d0e6b98fa303':
Cleanup static references when quitting.

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 18:07:02 +0000 (10:07 -0800)]

am e29e4d2a: am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1

* commit 'e29e4d2adef21aa54b2ae4bf225e3492bc3735c3':
Extracted text problems

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:27 +0000 (10:05 -0800)]

Merge "Cleanup references when turning BT off." into ics-mr1

commit | commitdiff | tree

Jaikumar Ganesh [Tue, 29 Nov 2011 18:05:13 +0000 (10:05 -0800)]

Merge "Cleanup static references when quitting." into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 18:04:38 +0000 (10:04 -0800)]

am 6c9d4f3c: am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1

* commit '6c9d4f3cd3c5185cda06f3bf83049dba81007bd1':
IOOB in text selection.

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 18:04:01 +0000 (10:04 -0800)]

am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1

* commit '9d8d529739b1b9790599364f57cffbe022d15ee2':
Extracted text problems

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 18:01:43 +0000 (10:01 -0800)]

am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1

* commit '0dca407eede3d85a0185718f4993c2b09d1cc658':
IOOB in text selection.

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 18:01:35 +0000 (10:01 -0800)]

am 10232fe6: Merge "Extracted text problems" into ics-mr1

* commit '10232fe63916d03d147d0a07f8bf4d70cb60941c':
Extracted text problems

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 17:59:25 +0000 (09:59 -0800)]

am 7be31bd9: Merge "IOOB in text selection." into ics-mr1

* commit '7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
IOOB in text selection.

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 17:59:00 +0000 (09:59 -0800)]

Merge "Extracted text problems" into ics-mr1

commit | commitdiff | tree

Gilles Debunne [Tue, 29 Nov 2011 17:56:58 +0000 (09:56 -0800)]

Merge "IOOB in text selection." into ics-mr1

commit | commitdiff | tree

Daniel Sandler [Tue, 29 Nov 2011 13:56:07 +0000 (05:56 -0800)]

am 0e9c942e: am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

* commit '0e9c942e4a97c0416928d9697f6e92be8faff5a3':
Quick fix for bug 5646217 blocking automation tests

commit | commitdiff | tree

Daniel Sandler [Tue, 29 Nov 2011 13:54:09 +0000 (05:54 -0800)]

am 834c2870: am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

* commit '834c2870fa422098b3728ae26099b3030994f86f':
Quick fix for bug 5646217 blocking automation tests

commit | commitdiff | tree

Daniel Sandler [Tue, 29 Nov 2011 13:51:18 +0000 (05:51 -0800)]

am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

* commit 'fed7a99a5294856d930e18225898828bd6755be1':
Quick fix for bug 5646217 blocking automation tests

commit | commitdiff | tree

Daniel Sandler [Tue, 29 Nov 2011 13:49:11 +0000 (05:49 -0800)]

Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1

commit | commitdiff | tree

Yu Shan Emily Lau [Tue, 29 Nov 2011 03:59:43 +0000 (19:59 -0800)]

am 9a8246c8: am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

* commit '9a8246c8d1ea324b6704bf4fe0b77ade1c2f3639':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.

commit | commitdiff | tree

Yu Shan Emily Lau [Tue, 29 Nov 2011 03:57:26 +0000 (19:57 -0800)]

am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

* commit '77d1ebbd7bd42d849911e680a63eec02e8b444db':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.

commit | commitdiff | tree

Yu Shan Emily Lau [Tue, 29 Nov 2011 03:55:27 +0000 (19:55 -0800)]

am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.

commit | commitdiff | tree

Yu Shan Emily Lau [Tue, 29 Nov 2011 03:53:58 +0000 (19:53 -0800)]

Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1

commit | commitdiff | tree

Christopher Tate [Tue, 29 Nov 2011 02:02:15 +0000 (18:02 -0800)]

am 2f9e2601: am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1

* commit '2f9e260185e9c83800ba14fdc7abeb95a399f526':
Add iteration-limited mode to FrameworkPerf

commit | commitdiff | tree

Christopher Tate [Tue, 29 Nov 2011 02:00:36 +0000 (18:00 -0800)]

am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1

* commit '6d7bd049b02cd24429e540b764c44c8371b7d5eb':
Add iteration-limited mode to FrameworkPerf

commit | commitdiff | tree

Christopher Tate [Tue, 29 Nov 2011 01:58:25 +0000 (17:58 -0800)]

am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1

* commit '051606150a80efa71b139e9d52fe6c8b2c02c884':
Add iteration-limited mode to FrameworkPerf

commit | commitdiff | tree

Christopher Tate [Tue, 29 Nov 2011 01:56:18 +0000 (17:56 -0800)]

Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 01:01:38 +0000 (17:01 -0800)]

am 462a9da4: am 4f5434f3: am e5715521: am 2d9f4620: Fix build

* commit '462a9da4c3525ff7d9bf599ccf1b79e58a2bd4f2':
Fix build

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:59:20 +0000 (16:59 -0800)]

am 4f5434f3: am e5715521: am 2d9f4620: Fix build

* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
Fix build

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 00:59:18 +0000 (16:59 -0800)]

am c0b7f65a: am 496f6e2a: am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

* commit 'c0b7f65ae0594e19d1272e5caf2d83638041d19c':
Fix issue #5588689: Black camera preview after coming back from gmail

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 00:57:17 +0000 (16:57 -0800)]

am 496f6e2a: am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

* commit '496f6e2ad656c5bb8a277e191554d16abd290b58':
Fix issue #5588689: Black camera preview after coming back from gmail

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:57:14 +0000 (16:57 -0800)]

am e5715521: am 2d9f4620: Fix build

* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
Fix build

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 00:55:05 +0000 (16:55 -0800)]

am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

* commit 'b54980d1d4d903f68cdfa952256afff01902cd94':
Fix issue #5588689: Black camera preview after coming back from gmail

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:53:50 +0000 (16:53 -0800)]

am 2d9f4620: Fix build

* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
Fix build

commit | commitdiff | tree

Dianne Hackborn [Tue, 29 Nov 2011 00:53:00 +0000 (16:53 -0800)]

Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

commit | commitdiff | tree

Romain Guy [Tue, 29 Nov 2011 00:13:31 +0000 (16:13 -0800)]

am cb52d676: am 02e88f23: am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1

* commit 'cb52d6760078197cd6d0c16349348dd2ad16a88c':
Fix crash in existing applications Bug #5659476

commit | commitdiff | tree

Romain Guy [Tue, 29 Nov 2011 00:11:27 +0000 (16:11 -0800)]

am 02e88f23: am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1

* commit '02e88f23a65c602e83d7a46c0925e653b948e418':
Fix crash in existing applications Bug #5659476

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:09:32 +0000 (16:09 -0800)]

am 74802557: am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

* commit '748025579912f92609cadd71786805e10281858d':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901

commit | commitdiff | tree

Romain Guy [Tue, 29 Nov 2011 00:08:52 +0000 (16:08 -0800)]

am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1

* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
Fix crash in existing applications Bug #5659476

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:07:13 +0000 (16:07 -0800)]

am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

* commit '6c509ef0bad761feecfd94b66d532ae05b450317':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901

commit | commitdiff | tree

Romain Guy [Tue, 29 Nov 2011 00:06:52 +0000 (16:06 -0800)]

Merge "Fix crash in existing applications Bug #5659476" into ics-mr1

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:04:39 +0000 (16:04 -0800)]

am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

* commit 'da822367886d68f997153c7edd5368f3dfb6d58d':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:02:44 +0000 (16:02 -0800)]

am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

* commit '25261f59af0d902f239e541b735f7dc31e714b07':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901

commit | commitdiff | tree

Xia Wang [Tue, 29 Nov 2011 00:00:49 +0000 (16:00 -0800)]

Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

commit | commitdiff | tree

Chet Haase [Mon, 28 Nov 2011 23:52:08 +0000 (15:52 -0800)]

am d3ea6b40: am 38928899: am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1

* commit 'd3ea6b40bb8f0fbc2a877963db1ab4fa0fc02b2f':
Fix flashing wifi dialog after rotating back from landscape.

commit | commitdiff | tree

Glenn Kasten [Mon, 28 Nov 2011 23:51:56 +0000 (15:51 -0800)]

am 589364c7: Merge "Make AudioTrack a RefBase so wrappers not needed"

* commit '589364c7179e764f4e8b9c0d53f45a1abf528aa8':
Make AudioTrack a RefBase so wrappers not needed

commit | commitdiff | tree

Chet Haase [Mon, 28 Nov 2011 23:47:16 +0000 (15:47 -0800)]

am 38928899: am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1

* commit '3892889952b0ad3fa0b095c96d8ae2ae110585e2':
Fix flashing wifi dialog after rotating back from landscape.

commit | commitdiff | tree

Chet Haase [Mon, 28 Nov 2011 23:45:32 +0000 (15:45 -0800)]

am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1

* commit '8990cb5768efba46bb1d7458377dd44498afcfdb':
Fix flashing wifi dialog after rotating back from landscape.

commit | commitdiff | tree

Chet Haase [Mon, 28 Nov 2011 23:43:23 +0000 (15:43 -0800)]

Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1

commit | commitdiff | tree

Mathias Agopian [Fri, 18 Nov 2011 01:48:35 +0000 (17:48 -0800)]

split ComposerService out of SurfaceComposerClient.h

Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6

commit | commitdiff | tree

Mathias Agopian [Thu, 24 Nov 2011 00:49:10 +0000 (16:49 -0800)]

rewrite SF's message loop on top of Looper

Change-Id: Ib56139f87a5c0b124e34da5c8151207219b2577b

commit | commitdiff | tree

Glenn Kasten [Mon, 28 Nov 2011 22:54:28 +0000 (14:54 -0800)]

Merge "Make AudioTrack a RefBase so wrappers not needed"

commit | commitdiff | tree

Eric Rowe [Mon, 28 Nov 2011 22:32:16 +0000 (14:32 -0800)]

am 866103c0: am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1

* commit '866103c00dd8028443ee8d7f9f3ca89f4acbc179':
Fix SCO start stop tests.

commit | commitdiff | tree

Eric Rowe [Mon, 28 Nov 2011 22:28:35 +0000 (14:28 -0800)]

am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1

* commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3':
Fix SCO start stop tests.

commit | commitdiff | tree

Eric Rowe [Mon, 28 Nov 2011 22:26:39 +0000 (14:26 -0800)]

am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1

* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
Fix SCO start stop tests.

commit | commitdiff | tree

Eric Rowe [Mon, 28 Nov 2011 20:32:34 +0000 (12:32 -0800)]

Merge "Fix SCO start stop tests." into ics-mr1

commit | commitdiff | tree

Narayan Kamath [Mon, 28 Nov 2011 18:45:28 +0000 (10:45 -0800)]

am 31825c11: am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1

* commit '31825c119907af5b24dc916df56a3efd2715af79':
Fix TTS instantiation from webview accessibility handlers.

commit | commitdiff | tree

Narayan Kamath [Mon, 28 Nov 2011 18:42:00 +0000 (10:42 -0800)]

am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1

* commit 'be1b5ce498a68e28d47a167495f47787d6461e88':
Fix TTS instantiation from webview accessibility handlers.

commit | commitdiff | tree

Derek Sollenberger [Mon, 28 Nov 2011 18:41:10 +0000 (10:41 -0800)]

am 376690c0: am aceb7f8b: am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1

* commit '376690c00f05c3a8c414c671428e3537ed0c577e':
Update Webkit with the zoom level after double tap gesture

commit | commitdiff | tree

Narayan Kamath [Mon, 28 Nov 2011 18:39:07 +0000 (10:39 -0800)]

am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1

* commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
Fix TTS instantiation from webview accessibility handlers.

commit | commitdiff | tree

Ben Murdoch [Mon, 28 Nov 2011 18:38:59 +0000 (10:38 -0800)]

am e189f0c6: am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.

* commit 'e189f0c6db60021251f688ed76874ad1d1e1d962':
Ensure we dismiss the <select> option dialog.

commit | commitdiff | tree

Derek Sollenberger [Mon, 28 Nov 2011 18:38:41 +0000 (10:38 -0800)]

am aceb7f8b: am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1

* commit 'aceb7f8b29bdcf8bf7fdc14ec9b99f54f2a2a3d2':
Update Webkit with the zoom level after double tap gesture

commit | commitdiff | tree

Narayan Kamath [Mon, 28 Nov 2011 18:36:32 +0000 (10:36 -0800)]

Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1

commit | commitdiff | tree

Ben Murdoch [Mon, 28 Nov 2011 18:36:22 +0000 (10:36 -0800)]

am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.

* commit 'b11387a6e51c424e421b0951de20db46a5f5c992':
Ensure we dismiss the <select> option dialog.

commit | commitdiff | tree

Derek Sollenberger [Mon, 28 Nov 2011 18:35:57 +0000 (10:35 -0800)]

am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1

* commit '425c595acb798ed9652b5a1f0e5412cbd8e3873d':
Update Webkit with the zoom level after double tap gesture

commit | commitdiff | tree

Derek Sollenberger [Mon, 28 Nov 2011 18:34:04 +0000 (10:34 -0800)]

Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1

commit | commitdiff | tree

Ben Murdoch [Mon, 28 Nov 2011 18:33:48 +0000 (10:33 -0800)]

am 2ffc9ec3: Ensure we dismiss the <select> option dialog.

* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
Ensure we dismiss the <select> option dialog.

commit | commitdiff | tree

Logan Chien [Sun, 27 Nov 2011 08:52:49 +0000 (00:52 -0800)]

am 12be3fff: Remove dead code.

* commit '12be3fff12e5c55193867f49e13169b9400b2997':
Remove dead code.

commit | commitdiff | tree

Jeff Brown [Thu, 24 Nov 2011 20:23:14 +0000 (12:23 -0800)]

am b145ae9e: Merge "Use sized integer typedefs in hash_type specializations."

* commit 'b145ae9eca9c6a998d15915b17346d35991ad0af':
Use sized integer typedefs in hash_type specializations.

commit | commitdiff | tree

Jeff Brown [Thu, 24 Nov 2011 20:21:46 +0000 (12:21 -0800)]

Merge "Use sized integer typedefs in hash_type specializations."

commit | commitdiff | tree

Jeff Brown [Thu, 24 Nov 2011 19:54:21 +0000 (11:54 -0800)]

Use sized integer typedefs in hash_type specializations.

Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845

commit | commitdiff | tree

Narayan Kamath [Thu, 24 Nov 2011 17:43:28 +0000 (09:43 -0800)]

am 6ddbe5b5: am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1

* commit '6ddbe5b587ea6ea9cb8291853c8e359096406bd4':
Fix regressions in TTS completion callbacks.

commit | commitdiff | tree

Narayan Kamath [Thu, 24 Nov 2011 17:41:48 +0000 (09:41 -0800)]

am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1

* commit 'b567c41b00fd196a2994f3cf8090b8a503c04939':
Fix regressions in TTS completion callbacks.

commit | commitdiff | tree

Narayan Kamath [Thu, 24 Nov 2011 17:40:04 +0000 (09:40 -0800)]

am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1

* commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
Fix regressions in TTS completion callbacks.

commit | commitdiff | tree

Narayan Kamath [Thu, 24 Nov 2011 17:38:15 +0000 (09:38 -0800)]

Merge "Fix regressions in TTS completion callbacks." into ics-mr1

commit | commitdiff | tree

Irfan Sheriff [Thu, 24 Nov 2011 03:24:44 +0000 (19:24 -0800)]

am 4b173c0d: am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1

* commit '4b173c0d8c168372c0056849cddc932328a6fdd5':
Fix tethering interaction from wifi

commit | commitdiff | tree

Irfan Sheriff [Thu, 24 Nov 2011 03:22:50 +0000 (19:22 -0800)]

am 694b266e: am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1

* commit '694b266e0366e5400d577659d1bb8152f0a106e7':
Fix tethering interaction from wifi