Gilles Debunne
e1d823147e
am 9d8d5297: am 10232fe6: Merge "Extracted text problems" into ics-mr1
...
* commit '9d8d529739b1b9790599364f57cffbe022d15ee2':
Extracted text problems
2011-11-29 10:04:01 -08:00
Gilles Debunne
acae657cb5
am 0dca407e: am 7be31bd9: Merge "IOOB in text selection." into ics-mr1
...
* commit '0dca407eede3d85a0185718f4993c2b09d1cc658':
IOOB in text selection.
2011-11-29 10:01:43 -08:00
Gilles Debunne
f0ec6fbcbc
am 10232fe6: Merge "Extracted text problems" into ics-mr1
...
* commit '10232fe63916d03d147d0a07f8bf4d70cb60941c':
Extracted text problems
2011-11-29 10:01:35 -08:00
Gilles Debunne
736fa13542
am 7be31bd9: Merge "IOOB in text selection." into ics-mr1
...
* commit '7be31bd96a4cc71ebc2539573f062fa53cc7cb05':
IOOB in text selection.
2011-11-29 09:59:25 -08:00
Gilles Debunne
87b0b8c84c
Merge "Extracted text problems" into ics-mr1
2011-11-29 09:59:00 -08:00
Gilles Debunne
919cb05045
Merge "IOOB in text selection." into ics-mr1
2011-11-29 09:56:58 -08:00
Daniel Sandler
5d0b591ae6
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
2011-11-29 05:54:09 -08:00
Daniel Sandler
c6f48c6842
am fed7a99a: Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
...
* commit 'fed7a99a5294856d930e18225898828bd6755be1':
Quick fix for bug 5646217 blocking automation tests
2011-11-29 05:51:18 -08:00
Daniel Sandler
a6e18fc3de
Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1
2011-11-29 05:49:11 -08:00
Yu Shan Emily Lau
073bbccba7
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.
2011-11-28 19:57:26 -08:00
Yu Shan Emily Lau
ef56d02fe9
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.
2011-11-28 19:55:27 -08:00
Yu Shan Emily Lau
907e5e7c09
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
2011-11-28 19:53:58 -08:00
Christopher Tate
32766d965a
am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
...
* commit '6d7bd049b02cd24429e540b764c44c8371b7d5eb':
Add iteration-limited mode to FrameworkPerf
2011-11-28 18:00:36 -08:00
Christopher Tate
b4b54368c3
am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
...
* commit '051606150a80efa71b139e9d52fe6c8b2c02c884':
Add iteration-limited mode to FrameworkPerf
2011-11-28 17:58:25 -08:00
Christopher Tate
203e95eef8
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
2011-11-28 17:56:18 -08:00
Xia Wang
84de887732
am 4f5434f3: am e5715521: am 2d9f4620: Fix build
...
* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
Fix build
2011-11-28 16:59:20 -08:00
Dianne Hackborn
37e197943e
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
2011-11-28 16:57:17 -08:00
Xia Wang
5ee38d25d7
am e5715521: am 2d9f4620: Fix build
...
* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
Fix build
2011-11-28 16:57:14 -08:00
Dianne Hackborn
bfdb7b36bd
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
2011-11-28 16:55:05 -08:00
Xia Wang
efba5b5674
am 2d9f4620: Fix build
...
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
Fix build
2011-11-28 16:53:50 -08:00
Dianne Hackborn
7aa0d8fb3d
Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
2011-11-28 16:53:00 -08:00
Romain Guy
0cdeb5428e
am 02e88f23: am 46685db9: Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
...
* commit '02e88f23a65c602e83d7a46c0925e653b948e418':
Fix crash in existing applications Bug #5659476
2011-11-28 16:11:27 -08:00
Romain Guy
7a6b56de94
am 46685db9: Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
...
* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
Fix crash in existing applications Bug #5659476
2011-11-28 16:08:52 -08:00
Xia Wang
6b2a47a000
am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://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
2011-11-28 16:07:13 -08:00
Romain Guy
30d5c55ee7
Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
2011-11-28 16:06:52 -08:00
Xia Wang
7f800e1f7a
am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://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
2011-11-28 16:04:39 -08:00
Xia Wang
5c71c805c5
am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://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
2011-11-28 16:02:44 -08:00
Xia Wang
0969e94791
Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
2011-11-28 16:00:49 -08:00
Chet Haase
de92e84873
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.
2011-11-28 15:47:16 -08:00
Chet Haase
9ad4b15c32
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.
2011-11-28 15:45:32 -08:00
Chet Haase
a44370e22b
Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
2011-11-28 15:43:23 -08:00
Mathias Agopian
41f673c9b3
split ComposerService out of SurfaceComposerClient.h
...
Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
2011-11-28 15:21:57 -08:00
Mathias Agopian
f61c57fe2e
rewrite SF's message loop on top of Looper
...
Change-Id: Ib56139f87a5c0b124e34da5c8151207219b2577b
2011-11-28 15:21:57 -08:00
Glenn Kasten
26f68d62eb
Merge "Make AudioTrack a RefBase so wrappers not needed"
2011-11-28 14:54:28 -08:00
Eric Rowe
f9e80fc4a9
am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
...
* commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3':
Fix SCO start stop tests.
2011-11-28 14:28:35 -08:00
Eric Rowe
fdf761ba4b
am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
...
* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
Fix SCO start stop tests.
2011-11-28 14:26:39 -08:00
Eric Rowe
1d6410bcaf
Merge "Fix SCO start stop tests." into ics-mr1
2011-11-28 12:32:34 -08:00
Narayan Kamath
241b3333d1
am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
...
* commit 'be1b5ce498a68e28d47a167495f47787d6461e88':
Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:42:00 -08:00
Narayan Kamath
8b79bb0049
am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
...
* commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:39:07 -08:00
Derek Sollenberger
2b2f7870b3
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
2011-11-28 10:38:41 -08:00
Narayan Kamath
50db512db6
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
2011-11-28 10:36:32 -08:00
Ben Murdoch
d0b45e6f1c
am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
...
* commit 'b11387a6e51c424e421b0951de20db46a5f5c992':
Ensure we dismiss the <select> option dialog.
2011-11-28 10:36:22 -08:00
Derek Sollenberger
ac5e36c87d
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
2011-11-28 10:35:57 -08:00
Derek Sollenberger
7dea1f9e3e
Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
2011-11-28 10:34:04 -08:00
Ben Murdoch
54749d0da1
am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
...
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
Ensure we dismiss the <select> option dialog.
2011-11-28 10:33:48 -08:00
Jeff Brown
a9fca55246
Merge "Use sized integer typedefs in hash_type specializations."
2011-11-24 12:21:46 -08:00
Jeff Brown
48585f35c7
Use sized integer typedefs in hash_type specializations.
...
Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845
2011-11-24 11:54:21 -08:00
Narayan Kamath
5199713e73
am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
...
* commit 'b567c41b00fd196a2994f3cf8090b8a503c04939':
Fix regressions in TTS completion callbacks.
2011-11-24 09:41:48 -08:00
Narayan Kamath
593e3ffd14
am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
...
* commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
Fix regressions in TTS completion callbacks.
2011-11-24 09:40:04 -08:00
Narayan Kamath
8c65dea758
Merge "Fix regressions in TTS completion callbacks." into ics-mr1
2011-11-24 09:38:15 -08:00