OSDN Git Service
Xia Wang [Tue, 29 Nov 2011 00:59:20 +0000 (16:59 -0800)]
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
Xia Wang [Tue, 29 Nov 2011 00:57:14 +0000 (16:57 -0800)]
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
Xia Wang [Tue, 29 Nov 2011 00:53:50 +0000 (16:53 -0800)]
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
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
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
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
Romain Guy [Tue, 29 Nov 2011 00:06:52 +0000 (16:06 -0800)]
Merge "Fix crash in existing applications Bug #
5659476" into ics-mr1
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
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
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
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.
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.
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
Glenn Kasten [Mon, 28 Nov 2011 22:54:28 +0000 (14:54 -0800)]
Merge "Make AudioTrack a RefBase so wrappers not needed"
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.
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.
Eric Rowe [Mon, 28 Nov 2011 20:32:34 +0000 (12:32 -0800)]
Merge "Fix SCO start stop tests." into ics-mr1
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.
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.
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
Narayan Kamath [Mon, 28 Nov 2011 18:36:32 +0000 (10:36 -0800)]
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
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.
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
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
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.
Jeff Brown [Thu, 24 Nov 2011 20:21:46 +0000 (12:21 -0800)]
Merge "Use sized integer typedefs in hash_type specializations."
Jeff Brown [Thu, 24 Nov 2011 19:54:21 +0000 (11:54 -0800)]
Use sized integer typedefs in hash_type specializations.
Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845
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.
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.
Narayan Kamath [Thu, 24 Nov 2011 17:38:15 +0000 (09:38 -0800)]
Merge "Fix regressions in TTS completion callbacks." into ics-mr1
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
Irfan Sheriff [Thu, 24 Nov 2011 03:19:56 +0000 (19:19 -0800)]
am
7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
* commit '
7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
Fix tethering interaction from wifi
Irfan Sheriff [Thu, 24 Nov 2011 03:18:22 +0000 (19:18 -0800)]
Merge "Fix tethering interaction from wifi" into ics-mr1
John Wang [Thu, 24 Nov 2011 00:51:47 +0000 (16:51 -0800)]
am
08b52112: am
e95f4986: Merge "Fix a build break." into ics-mr1
* commit '
08b52112335dcbcd51fa387c2a9a92dc43efa689':
Fix a build break.
John Wang [Thu, 24 Nov 2011 00:50:04 +0000 (16:50 -0800)]
am
e95f4986: Merge "Fix a build break." into ics-mr1
* commit '
e95f49869b02dd9792718fb1075241acdf6ca775':
Fix a build break.
John Wang [Thu, 24 Nov 2011 00:48:32 +0000 (16:48 -0800)]
Merge "Fix a build break." into ics-mr1
Adam Cohen [Thu, 24 Nov 2011 00:42:46 +0000 (16:42 -0800)]
am
42afab37: am
8ce22f26: Fixing a typo in framework widget padding
* commit '
42afab3799c5dba8abccabe231b74c96d5ff0c14':
Fixing a typo in framework widget padding
Adam Cohen [Thu, 24 Nov 2011 00:41:01 +0000 (16:41 -0800)]
am
8ce22f26: Fixing a typo in framework widget padding
* commit '
8ce22f2644acb51bfe0b9d600f1d2ad64e80513c':
Fixing a typo in framework widget padding
John Wang [Wed, 23 Nov 2011 23:39:34 +0000 (15:39 -0800)]
am
39c293f4: am
9b108009: Check watingApns before access it.
* commit '
39c293f4392f6c4bb4da6182123a0511cabb0df1':
Check watingApns before access it.
John Wang [Wed, 23 Nov 2011 23:37:20 +0000 (15:37 -0800)]
am
9b108009: Check watingApns before access it.
* commit '
9b1080091c4ac97378db366cdd6961aba28756c5':
Check watingApns before access it.
Jeff Brown [Wed, 23 Nov 2011 23:32:09 +0000 (15:32 -0800)]
Merge "Add a basic hashtable data structure, with tests!"
Stephen Hines [Wed, 23 Nov 2011 21:58:13 +0000 (13:58 -0800)]
Merge "Add support for handling a bitcode wrapper to librs."
Eric Laurent [Wed, 23 Nov 2011 20:35:01 +0000 (12:35 -0800)]
am
f6422f5f: am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
f6422f5f5d04aab47f8f36a0ea92e2140bed0105':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 20:32:53 +0000 (12:32 -0800)]
am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 20:31:04 +0000 (12:31 -0800)]
Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
Michael Chan [Wed, 23 Nov 2011 20:16:21 +0000 (12:16 -0800)]
am
a181a919: am
37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '
a181a9197c0affbcddd627c625c8064f494b94d6':
Update description of account_type
Michael Chan [Wed, 23 Nov 2011 20:14:16 +0000 (12:14 -0800)]
am
37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '
37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
Update description of account_type
Michael Chan [Wed, 23 Nov 2011 20:12:51 +0000 (12:12 -0800)]
Merge "Update description of account_type" into ics-mr1
Robert Greenwalt [Wed, 23 Nov 2011 19:29:24 +0000 (11:29 -0800)]
am
18f05518: am
eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit '
18f05518a882eeb778433c65bff27831a8accdc2':
Fix some policy-base routing issues.
Robert Greenwalt [Wed, 23 Nov 2011 19:27:06 +0000 (11:27 -0800)]
am
eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit '
eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
Fix some policy-base routing issues.
Robert Greenwalt [Wed, 23 Nov 2011 19:25:39 +0000 (11:25 -0800)]
Merge "Fix some policy-base routing issues." into ics-mr1
Owen Lin [Wed, 23 Nov 2011 01:48:49 +0000 (17:48 -0800)]
am
85c38af1: am
8bb56180: Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '
85c38af1d47e288775052cd188e3f014fa40e8a2':
Fix
5654631. It forgot to consider the year in formatDateRange.
Owen Lin [Wed, 23 Nov 2011 01:46:35 +0000 (17:46 -0800)]
am
8bb56180: Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
* commit '
8bb56180d208b9264e5a56b49fe06b8471ccaced':
Fix
5654631. It forgot to consider the year in formatDateRange.
Owen Lin [Wed, 23 Nov 2011 01:44:52 +0000 (17:44 -0800)]
Merge "Fix
5654631. It forgot to consider the year in formatDateRange." into ics-mr1
James Dong [Wed, 23 Nov 2011 01:36:45 +0000 (17:36 -0800)]
Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."
Jeff Brown [Tue, 15 Nov 2011 02:29:15 +0000 (18:29 -0800)]
Add a basic hashtable data structure, with tests!
The basic hashtable is intended to be used to support a variety
of different datastructures such as map, set, multimap,
multiset, linkedmap, generationcache, etc.
Consequently its interface is fairly primitive.
The basic hashtable supports copy-on-write style functionality
using SharedBuffer.
The change introduces a simple generic function in TypeHelpers for
specifying hash functions. The idea is to add template
specializations of hash_type<T> next to the relevant data structures
such as String8, String16, sp<T>, etc.
Change-Id: I2c479229e9d4527b4fbfe3b8b04776a2fd32c973
Robert Ly [Wed, 23 Nov 2011 00:21:45 +0000 (16:21 -0800)]
Merge "add overview description for RS API reference"
Jason Sams [Wed, 23 Nov 2011 00:05:48 +0000 (16:05 -0800)]
Merge "Fix script init error handling."
The Android Open Source Project [Tue, 22 Nov 2011 23:29:52 +0000 (15:29 -0800)]
The Android Open Source Project [Tue, 22 Nov 2011 23:26:16 +0000 (15:26 -0800)]
am
1889bb49: Reconcile with ics-mr0-release
* commit '
1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
The Android Open Source Project [Tue, 22 Nov 2011 23:24:03 +0000 (15:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
The Android Open Source Project [Tue, 22 Nov 2011 23:18:08 +0000 (15:18 -0800)]
The Android Open Source Project [Tue, 22 Nov 2011 23:16:08 +0000 (15:16 -0800)]
am
27239099: Reconcile with ics-mr0-release
* commit '
2723909903b68db016666a13ec897581a8915636':
The Android Open Source Project [Tue, 22 Nov 2011 23:15:44 +0000 (15:15 -0800)]
Reconcile with ics-mr0-release
Change-Id: I6367147c460a2e3eb2c13ac3fdb3946ab5fec9d0
The Android Open Source Project [Tue, 22 Nov 2011 23:14:10 +0000 (15:14 -0800)]
Reconcile with ics-mr0-release
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
The Android Automerger [Tue, 22 Nov 2011 22:28:06 +0000 (14:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Open Source Project [Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
dujin.cha [Tue, 22 Nov 2011 21:22:00 +0000 (13:22 -0800)]
am
4d592c59: am
eabde3d4: am
fe464a76: [Prime K] Fix gabage character issue
* commit '
4d592c59e684ed3e6f0db4b05c37ba8774b8d410':
[Prime K] Fix gabage character issue
dujin.cha [Tue, 22 Nov 2011 21:20:09 +0000 (13:20 -0800)]
am
eabde3d4: am
fe464a76: [Prime K] Fix gabage character issue
* commit '
eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
[Prime K] Fix gabage character issue
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:19:58 +0000 (13:19 -0800)]
am
63899f78: (-s ours) am
eff6ed0f: Ignore
e36657e5
* commit '
63899f78729a292e77cab0c9c01fff23b69a1b02':
Do not merge. Fix a memory leak of a Binder in SpellCheckerService
dujin.cha [Tue, 22 Nov 2011 21:18:27 +0000 (13:18 -0800)]
am
fe464a76: [Prime K] Fix gabage character issue
* commit '
fe464a76d8fc858be971dbb5e67b1d22fd925347':
[Prime K] Fix gabage character issue
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:18:05 +0000 (13:18 -0800)]
am
eff6ed0f: Ignore
e36657e5
* commit '
eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
Do not merge. Fix a memory leak of a Binder in SpellCheckerService
Jean-Baptiste Queru [Tue, 22 Nov 2011 21:15:28 +0000 (13:15 -0800)]
Ignore
e36657e5
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
Jeff Brown [Tue, 22 Nov 2011 20:57:08 +0000 (12:57 -0800)]
Merge "Use libcorkscrew to format the stack trace."
Romain Guy [Tue, 22 Nov 2011 20:42:06 +0000 (12:42 -0800)]
am
a2fabf4a: am
303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #
5650514" into ics-mr1
* commit '
a2fabf4a109d46f99ff7370aa05e48c1708c2838':
Draw in the correct FBO after invoking a GL functor Bug #
5650514
Romain Guy [Tue, 22 Nov 2011 20:42:04 +0000 (12:42 -0800)]
am
e25ed181: am
26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #
5638421" into ics-mr1
* commit '
e25ed181070579fca2522112b1659af2fbf8ddfc':
Ensure we have an EGL context when building layers Bug #
5638421
Amith Yamasani [Tue, 22 Nov 2011 20:41:57 +0000 (12:41 -0800)]
am
d61b61d6: am
227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit '
d61b61d6f97f9f73b86e4a24a747c4451f2bc939':
Fix an NPE on overflow in BatteryStats history.
Romain Guy [Tue, 22 Nov 2011 20:35:25 +0000 (12:35 -0800)]
am
303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #
5650514" into ics-mr1
* commit '
303a0695b8fa0b8f0095c437145a28633a7a8d92':
Draw in the correct FBO after invoking a GL functor Bug #
5650514
Romain Guy [Tue, 22 Nov 2011 20:35:18 +0000 (12:35 -0800)]
am
26dd54f8: Merge "Ensure we have an EGL context when building layers Bug #
5638421" into ics-mr1
* commit '
26dd54f87c1daaa369576d9abea823c8105bd702':
Ensure we have an EGL context when building layers Bug #
5638421
Romain Guy [Tue, 22 Nov 2011 20:33:17 +0000 (12:33 -0800)]
Merge "Draw in the correct FBO after invoking a GL functor Bug #
5650514" into ics-mr1
Romain Guy [Tue, 22 Nov 2011 20:33:04 +0000 (12:33 -0800)]
Merge "Ensure we have an EGL context when building layers Bug #
5638421" into ics-mr1
The Android Automerger [Tue, 22 Nov 2011 19:56:20 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Fabrice Di Meglio [Tue, 22 Nov 2011 19:23:49 +0000 (11:23 -0800)]
Merge "Improve TextLayoutCache performances"
Amith Yamasani [Tue, 22 Nov 2011 19:04:58 +0000 (11:04 -0800)]
am
227a64fe: Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
* commit '
227a64fe23b4e6f05dc31e5f51b0f4c142e52b18':
Fix an NPE on overflow in BatteryStats history.
Amith Yamasani [Tue, 22 Nov 2011 19:02:49 +0000 (11:02 -0800)]
Merge "Fix an NPE on overflow in BatteryStats history." into ics-mr1
Teng-Hui Zhu [Tue, 22 Nov 2011 16:59:36 +0000 (08:59 -0800)]
am
b8ee50ee: am
7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit '
b8ee50eece1481110721cb4e93a54c03fbf77d27':
HTML5 Video runs into super full screen mode
Teng-Hui Zhu [Tue, 22 Nov 2011 16:57:02 +0000 (08:57 -0800)]
am
7257a32b: Merge "HTML5 Video runs into super full screen mode" into ics-mr1
* commit '
7257a32b9ac7cbbb47659ed7bea4ab47e74ac3ec':
HTML5 Video runs into super full screen mode
Teng-Hui Zhu [Tue, 22 Nov 2011 16:54:59 +0000 (08:54 -0800)]
Merge "HTML5 Video runs into super full screen mode" into ics-mr1
Andreas Huber [Tue, 22 Nov 2011 16:43:28 +0000 (08:43 -0800)]
am
31626b30: am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
31626b3075335f4cf579342e99436bb45870cf55':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:41:04 +0000 (08:41 -0800)]
am
cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
* commit '
cb6fbc89c25298643ab342b4a228e772b0e56978':
Report a runtime error instead of asserting on malformed avc configuration data.
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
Daniel Sandler [Tue, 22 Nov 2011 15:19:02 +0000 (07:19 -0800)]
am
70f1279e: am
63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '
70f1279e65eaa138f297a8f590f8383f2c76f7b4':
Dismiss system windows when screen savers start.
Daniel Sandler [Tue, 22 Nov 2011 15:16:47 +0000 (07:16 -0800)]
am
63188574: Merge "Dismiss system windows when screen savers start." into ics-mr1
* commit '
631885746868cbf03f89e655a6f4fac96449e8a4':
Dismiss system windows when screen savers start.
Daniel Sandler [Tue, 22 Nov 2011 15:15:29 +0000 (07:15 -0800)]
Merge "Dismiss system windows when screen savers start." into ics-mr1
Mangesh Ghiware [Tue, 22 Nov 2011 07:18:04 +0000 (23:18 -0800)]
am
d7b06977: am
8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit '
d7b06977e927557923a6101493c0af1aa857271b':
Update zoom (aka display) density from WebView thread.
Mangesh Ghiware [Tue, 22 Nov 2011 07:16:06 +0000 (23:16 -0800)]
am
8d03007f: Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
* commit '
8d03007f80d74abadfc96926e7cca40d38380bc0':
Update zoom (aka display) density from WebView thread.
Mangesh Ghiware [Tue, 22 Nov 2011 07:14:05 +0000 (23:14 -0800)]
Merge "Update zoom (aka display) density from WebView thread." into ics-mr1
OSDN Git Service
