OSDN Git Service
Mathias Agopian [Tue, 31 Jan 2012 01:45:28 +0000 (17:45 -0800)]
am
11c5db5e: Merge "add all needed GL extension wrappers"
* commit '
11c5db5e29f9e4ac4cdb0bb49197b48deb657e36':
add all needed GL extension wrappers
Romain Guy [Tue, 31 Jan 2012 01:45:25 +0000 (17:45 -0800)]
am
1e56fff3: Merge "Add debug markers to OpenGLRenderer"
* commit '
1e56fff3b90946b342ddabf68648dc3551ce47db':
Add debug markers to OpenGLRenderer
Mathias Agopian [Tue, 31 Jan 2012 01:44:09 +0000 (17:44 -0800)]
Merge "add all needed GL extension wrappers"
Romain Guy [Tue, 31 Jan 2012 01:43:37 +0000 (17:43 -0800)]
Merge "Add debug markers to OpenGLRenderer"
Mathias Agopian [Tue, 31 Jan 2012 01:40:29 +0000 (17:40 -0800)]
add all needed GL extension wrappers
when increasing MAX_NUMBER_OF_GL_EXTENSIONS to 256
we also needed to create all the corresponding wrappers.
Change-Id: I90edaaf0885ccdfab48e7a1396bcf88e039cfb25
Gilles Debunne [Tue, 31 Jan 2012 01:03:54 +0000 (17:03 -0800)]
am
79e3e5f5: Merge "Removed SoftInputShownOnFocus methods in TextView"
* commit '
79e3e5f5d4e8260db8a60f120471ce3ec91f8981':
Removed SoftInputShownOnFocus methods in TextView
Gilles Debunne [Tue, 31 Jan 2012 01:01:19 +0000 (17:01 -0800)]
Merge "Removed SoftInputShownOnFocus methods in TextView"
Svetoslav Ganov [Tue, 31 Jan 2012 00:39:53 +0000 (16:39 -0800)]
am
12df3cf1: Merge "Incorrect behavior of View clear focus."
* commit '
12df3cf156885a421beccfa6b6e20fd1a188847a':
Incorrect behavior of View clear focus.
Svetoslav Ganov [Tue, 31 Jan 2012 00:37:33 +0000 (16:37 -0800)]
Merge "Incorrect behavior of View clear focus."
Scott Main [Tue, 31 Jan 2012 00:20:41 +0000 (16:20 -0800)]
am
f68af846: am
6e4f886d: am
b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '
f68af846d472e59f1a8280f250a1f0b9ac13abd9':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
Scott Main [Tue, 31 Jan 2012 00:18:54 +0000 (16:18 -0800)]
am
6e4f886d: am
b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '
6e4f886db034b954a305611cc71a10ff7d1c75ae':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
Scott Main [Tue, 31 Jan 2012 00:15:29 +0000 (16:15 -0800)]
am
b2d37b39: Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
* commit '
b2d37b39a1bb48d9f9c5b45255c5df769b85d6ae':
docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results
Scott Main [Tue, 31 Jan 2012 00:13:28 +0000 (16:13 -0800)]
Merge "docs: update sidenav to use <span> instead of <h2> for headings, under suspicion that the h2s are causing poor snippet extraction in search results" into ics-mr1
Scott Main [Mon, 30 Jan 2012 23:31:15 +0000 (15:31 -0800)]
am
275345b0: am
a76ddf92: am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
275345b0871c6b269709c3d6a25d9fae03f7922a':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Mathias Agopian [Mon, 30 Jan 2012 23:28:45 +0000 (15:28 -0800)]
am
7ff542c1: Merge "SF now synchronizes to VSYNC"
* commit '
7ff542c1ae2436bac90669f18d034f369236c5ab':
SF now synchronizes to VSYNC
Eric Fischer [Mon, 30 Jan 2012 23:28:43 +0000 (15:28 -0800)]
am
47848567: Merge "Import translations. DO NOT MERGE"
* commit '
478485678a4898ed2da7a17adb1ba3d98ad6fff8':
Import translations. DO NOT MERGE
Scott Main [Mon, 30 Jan 2012 23:28:36 +0000 (15:28 -0800)]
am
a76ddf92: am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
a76ddf927278ec36f5a4589dbba85bb06bb1ae19':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Mathias Agopian [Mon, 30 Jan 2012 23:26:15 +0000 (15:26 -0800)]
am
818b4236: Merge "add support for GL_EXT_debug_marker"
* commit '
818b4236586d0dda696f363f1065c8f8abd64862':
add support for GL_EXT_debug_marker
Mathias Agopian [Mon, 30 Jan 2012 23:24:46 +0000 (15:24 -0800)]
Merge "SF now synchronizes to VSYNC"
Eric Fischer [Mon, 30 Jan 2012 23:24:41 +0000 (15:24 -0800)]
Merge "Import translations. DO NOT MERGE"
Mathias Agopian [Mon, 30 Jan 2012 23:23:47 +0000 (15:23 -0800)]
Merge "add support for GL_EXT_debug_marker"
Mathias Agopian [Wed, 25 Jan 2012 00:39:14 +0000 (16:39 -0800)]
SF now synchronizes to VSYNC
Change-Id: Ic5e4f2ea9927ce133eef9499c03161325e9d02c5
Scott Main [Mon, 30 Jan 2012 23:14:53 +0000 (15:14 -0800)]
am
6507df8b: docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
* commit '
6507df8b78d80403d66d321748ad47290a611e3f':
docs: add meta descriptions for home and sdk also revise the G+ widget to make fit
Alex Sakhartchouk [Mon, 30 Jan 2012 22:24:04 +0000 (14:24 -0800)]
Merge "Fixing possible pne." into graphics-dev
Romain Guy [Mon, 30 Jan 2012 22:15:30 +0000 (14:15 -0800)]
am
a585e8db: Merge "Always initialize AsyncTask on the main thread."
* commit '
a585e8dbcf33a9cfcca725b994a22e6d78d427f9':
Always initialize AsyncTask on the main thread.
Romain Guy [Mon, 30 Jan 2012 22:12:37 +0000 (14:12 -0800)]
Merge "Always initialize AsyncTask on the main thread."
The Android Open Source Project [Mon, 30 Jan 2012 21:42:59 +0000 (13:42 -0800)]
am
c7d75153: am
827a597d: Reconcile with ics-mr1-release
* commit '
c7d7515325e9ef827feb094dbf42f1c920ad7936':
Revert "Fix
5797764: Increase lock screen's thread priority"
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
The Android Open Source Project [Mon, 30 Jan 2012 21:38:52 +0000 (13:38 -0800)]
am
827a597d: Reconcile with ics-mr1-release
* commit '
827a597df70a51c6cccad52fae2be2c469f58b77':
Revert "Fix
5797764: Increase lock screen's thread priority"
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
The Android Open Source Project [Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
The Android Automerger [Mon, 30 Jan 2012 21:23:32 +0000 (13:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Gilles Debunne [Mon, 30 Jan 2012 21:01:18 +0000 (13:01 -0800)]
am
a8217330: Merge "Remove onPreDrawListeners earlier in TextView"
* commit '
a82173305991a24bc1400149b41bb998a6f50b38':
Remove onPreDrawListeners earlier in TextView
Dianne Hackborn [Mon, 30 Jan 2012 20:58:56 +0000 (12:58 -0800)]
am
a6989484: am
25fe8ef1: am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
a69894846c0e34228da71dccf4e8ef5ae95a45a3':
Update documentation to reflect the old approach not working.
Gilles Debunne [Mon, 30 Jan 2012 20:58:53 +0000 (12:58 -0800)]
Merge "Remove onPreDrawListeners earlier in TextView"
Alex Sakhartchouk [Mon, 30 Jan 2012 20:57:40 +0000 (12:57 -0800)]
Merge "Making the SceneGraph more robust to make sure data is propagated to RS. Caching RS name allocations." into graphics-dev
Dianne Hackborn [Mon, 30 Jan 2012 20:56:42 +0000 (12:56 -0800)]
am
25fe8ef1: am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
25fe8ef1b51b4a36e08b3fea35c0799f3d0840e2':
Update documentation to reflect the old approach not working.
Dianne Hackborn [Mon, 30 Jan 2012 20:54:02 +0000 (12:54 -0800)]
am
e22f4748: Merge "Update documentation to reflect the old approach not working." into ics-mr1
* commit '
e22f4748565915948c8af2961ac74fe81a417e3b':
Update documentation to reflect the old approach not working.
Dianne Hackborn [Mon, 30 Jan 2012 20:52:11 +0000 (12:52 -0800)]
Merge "Update documentation to reflect the old approach not working." into ics-mr1
Andreas Huber [Mon, 30 Jan 2012 20:35:36 +0000 (12:35 -0800)]
am
e372593c: Merge "Instantiate software codecs locally whenever possible."
* commit '
e372593cfb973c8f8bdc46858dece9fcae9e178c':
Instantiate software codecs locally whenever possible.
Andreas Huber [Mon, 30 Jan 2012 20:32:58 +0000 (12:32 -0800)]
Merge "Instantiate software codecs locally whenever possible."
Stephen Hines [Mon, 30 Jan 2012 20:23:21 +0000 (12:23 -0800)]
am
855eadf9: Merge "Fix potential bug with reordered size/offset arguments."
* commit '
855eadf942c8ff5c2665d7dc3b6d4b5ba630419a':
Fix potential bug with reordered size/offset arguments.
Stephen Hines [Mon, 30 Jan 2012 20:22:10 +0000 (12:22 -0800)]
Merge "Fix potential bug with reordered size/offset arguments."
Romain Guy [Mon, 30 Jan 2012 20:07:07 +0000 (12:07 -0800)]
am
69726597: Merge "Add stencil buffer to the EGL config"
* commit '
69726597b300ec32f2d2c489cd3f312efd3077c2':
Add stencil buffer to the EGL config
Romain Guy [Mon, 30 Jan 2012 20:05:28 +0000 (12:05 -0800)]
Merge "Add stencil buffer to the EGL config"
Jeff Sharkey [Mon, 30 Jan 2012 19:55:31 +0000 (11:55 -0800)]
am
4d6da864: Merge "Move away from deprecated NetworkInfo extra."
* commit '
4d6da8649afc43022a156bffca6cd2c9127cefe1':
Move away from deprecated NetworkInfo extra.
Jeff Sharkey [Mon, 30 Jan 2012 19:53:32 +0000 (11:53 -0800)]
Merge "Move away from deprecated NetworkInfo extra."
John Wang [Mon, 30 Jan 2012 19:28:14 +0000 (11:28 -0800)]
am
7a41c701: am
136704a8: am
b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit '
7a41c7013d0ed319fcb4384cc4b5cf26b22d3580':
Adjust the LTE signal bar mapping.
John Wang [Mon, 30 Jan 2012 19:25:48 +0000 (11:25 -0800)]
am
136704a8: am
b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit '
136704a803ed7dd419a452315d1c0fe4885ce441':
Adjust the LTE signal bar mapping.
John Wang [Mon, 30 Jan 2012 19:23:24 +0000 (11:23 -0800)]
am
b069833e: Merge "Adjust the LTE signal bar mapping." into ics-mr1
* commit '
b069833e63f711a6b140385003d67b3ff68fe66b':
Adjust the LTE signal bar mapping.
John Wang [Mon, 30 Jan 2012 19:20:35 +0000 (11:20 -0800)]
Merge "Adjust the LTE signal bar mapping." into ics-mr1
Makoto Onuki [Mon, 30 Jan 2012 19:18:36 +0000 (11:18 -0800)]
am
d53da8ef: Merge "Fixing broken unittests."
* commit '
d53da8efa7a618562615df35ffc674620cbe2b26':
Fixing broken unittests.
Makoto Onuki [Mon, 30 Jan 2012 19:16:58 +0000 (11:16 -0800)]
Merge "Fixing broken unittests."
Scott Main [Mon, 30 Jan 2012 18:10:43 +0000 (10:10 -0800)]
am
f10d69f3: am
fb300fb2: am
73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '
f10d69f30107f27465684630460615443783f2bc':
docs: add G+ page announcement to homepage
Scott Main [Mon, 30 Jan 2012 18:08:14 +0000 (10:08 -0800)]
am
fb300fb2: am
73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '
fb300fb2f0f253c94c14090256f9695bca1a1e4b':
docs: add G+ page announcement to homepage
Scott Main [Mon, 30 Jan 2012 18:05:59 +0000 (10:05 -0800)]
am
73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1
* commit '
73790a53b580b8ec8eff88e25a19b5fcfa33392a':
docs: add G+ page announcement to homepage
Scott Main [Mon, 30 Jan 2012 18:03:21 +0000 (10:03 -0800)]
Merge "docs: add G+ page announcement to homepage" into ics-mr1
Siva Velusamy [Mon, 30 Jan 2012 17:09:33 +0000 (09:09 -0800)]
am
b0931673: Merge "gltrace: Use Unix Domain Socket rather than INET Socket"
* commit '
b09316736fe7b721d92900ad901894fd5ce2b854':
gltrace: Use Unix Domain Socket rather than INET Socket
Siva Velusamy [Mon, 30 Jan 2012 17:08:27 +0000 (09:08 -0800)]
Merge "gltrace: Use Unix Domain Socket rather than INET Socket"
Chet Haase [Mon, 30 Jan 2012 16:30:13 +0000 (08:30 -0800)]
am
c7685d6d: Merge "Fix bug in LayoutTransition for INVISIBLE views"
* commit '
c7685d6d6e4a7e3fe5b00d2420a66d1560a911dc':
Fix bug in LayoutTransition for INVISIBLE views
Marco Nelissen [Mon, 30 Jan 2012 16:30:10 +0000 (08:30 -0800)]
am
f3a3b9ec: Merge "Handle adding/removing/renaming nomedia paths"
* commit '
f3a3b9ec9ce6cb087dd3f4358684c00be23feec1':
Handle adding/removing/renaming nomedia paths
Chet Haase [Mon, 30 Jan 2012 16:28:18 +0000 (08:28 -0800)]
Merge "Fix bug in LayoutTransition for INVISIBLE views"
Marco Nelissen [Mon, 30 Jan 2012 16:27:57 +0000 (08:27 -0800)]
Merge "Handle adding/removing/renaming nomedia paths"
Mathias Agopian [Mon, 30 Jan 2012 07:17:04 +0000 (23:17 -0800)]
am
acabf488: remove unneeded code
* commit '
acabf488674e0f5a6d0fa6d1da5e36b417a681a0':
remove unneeded code
Mathias Agopian [Mon, 30 Jan 2012 06:40:08 +0000 (22:40 -0800)]
remove unneeded code
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
Mathias Agopian [Mon, 30 Jan 2012 06:24:52 +0000 (22:24 -0800)]
Mathias Agopian [Sun, 29 Jan 2012 05:44:00 +0000 (21:44 -0800)]
add support for GL_EXT_debug_marker
This extension is always added to the GL_EXTENSIONS
extension string for the current GL context, regardless
of if it's supported by the h/w driver.
The extension itself will be handled by GLES_trace (eventually),
when GLES_trace is not enabled, it'll result to a no-op.
If the h/w implementation has this extension, we'll call that version
instead of our dummy version.
Change-Id: Ie5dd3387c4d45cd5ed5f03b73bda6045620a96bc
Mathias Agopian [Mon, 30 Jan 2012 06:06:23 +0000 (22:06 -0800)]
am
0589e582: Merge "update GLES headers and add support for corresponding new extensions."
* commit '
0589e582361432f12848fdd59f8c408b7a31c35b':
update GLES headers and add support for corresponding new extensions.
Mathias Agopian [Mon, 30 Jan 2012 06:04:22 +0000 (22:04 -0800)]
am
c0e32a47: Merge "added a few more commands to SF\'s dumpsys"
* commit '
c0e32a47d5e31b81df5731952656be02d2dd8758':
added a few more commands to SF's dumpsys
Mathias Agopian [Mon, 30 Jan 2012 06:04:19 +0000 (22:04 -0800)]
am
b19e06f3: Merge "remove unused code"
* commit '
b19e06f3e53cf011a04d9e0f0529c2a94a7c3780':
remove unused code
Mathias Agopian [Mon, 30 Jan 2012 06:03:19 +0000 (22:03 -0800)]
Merge "update GLES headers and add support for corresponding new extensions."
Mathias Agopian [Mon, 30 Jan 2012 06:02:36 +0000 (22:02 -0800)]
Merge "added a few more commands to SF's dumpsys"
Mathias Agopian [Mon, 30 Jan 2012 06:01:41 +0000 (22:01 -0800)]
Merge "remove unused code"
Mathias Agopian [Sun, 29 Jan 2012 06:31:55 +0000 (22:31 -0800)]
added a few more commands to SF's dumpsys
--latency-clear [name]
clears the latency data for the specified layer or for
all layers if none is specified
--list
prints the list of all layers regardless of their visibility
Change-Id: I7c07ae020f838c173b98ee50f3fb3e93da78acbb
Mathias Agopian [Sat, 28 Jan 2012 22:20:59 +0000 (14:20 -0800)]
update GLES headers and add support for corresponding new extensions.
Change-Id: I554d9659113b4721b748ee5c1a3b1ca82b11d75e
Mathias Agopian [Sun, 29 Jan 2012 02:47:13 +0000 (18:47 -0800)]
remove unused code
Change-Id: If900fcc50f9ffc424e270cb6063b16a2d7bc04d3
Jean-Baptiste Queru [Sat, 28 Jan 2012 05:12:24 +0000 (21:12 -0800)]
am
0e1ad89c: am
27d2ab8b: am
dc8668c8: am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
0e1ad89ca5487babb39c52abcff9da41e0b84462':
Wi-Fi: Handle disconnect in middle of DHCP operation
Roman Nurik [Sat, 28 Jan 2012 05:12:20 +0000 (21:12 -0800)]
am
d28ce214: am
5525a43a: am
639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '
d28ce2140f060f020712efe687b1183b1e1c47ca':
docs: add NOTICE to action bar icon pack and sprinkle download links
Roman Nurik [Sat, 28 Jan 2012 05:12:17 +0000 (21:12 -0800)]
am
479c96c5: am
9d9c7189: am
00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '
479c96c5758ddd4bb92473bc22b6e366fdfc3114':
docs: Update designing-navigation training class to link to Android Design
Jean-Baptiste Queru [Sat, 28 Jan 2012 05:09:20 +0000 (21:09 -0800)]
am
27d2ab8b: am
dc8668c8: am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
27d2ab8b27e7e1927e18869e898fa556e5da3d43':
Wi-Fi: Handle disconnect in middle of DHCP operation
Roman Nurik [Sat, 28 Jan 2012 05:08:59 +0000 (21:08 -0800)]
am
5525a43a: am
639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1
* commit '
5525a43a9c814faba22adfafc6517fb64259966f':
docs: add NOTICE to action bar icon pack and sprinkle download links
Roman Nurik [Sat, 28 Jan 2012 05:08:50 +0000 (21:08 -0800)]
am
9d9c7189: am
00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1
* commit '
9d9c718925e8ec189ba4615f93c2fe8e7d0ab23d':
docs: Update designing-navigation training class to link to Android Design
Jim Miller [Sat, 28 Jan 2012 02:13:06 +0000 (18:13 -0800)]
am
118bb2bd: Fix
5906830: Don\'t crash on lock screens that lack a clock.
* commit '
118bb2bd86194454452655345846c85ec59ba547':
Fix
5906830: Don't crash on lock screens that lack a clock.
Jim Miller [Sat, 28 Jan 2012 01:43:57 +0000 (17:43 -0800)]
am
b90559a6: Merge "Fix
5906830: Update the clock earlier when lock screen comes back from suspend."
* commit '
b90559a6066965debe173e2ea94bbffb87ad2d6a':
Fix
5906830: Update the clock earlier when lock screen comes back from suspend.
Jim Miller [Sat, 28 Jan 2012 01:42:26 +0000 (17:42 -0800)]
Merge "Fix
5906830: Update the clock earlier when lock screen comes back from suspend."
Jeff Brown [Sat, 28 Jan 2012 01:38:56 +0000 (17:38 -0800)]
am
cb0af4f1: Merge "Improve watchdog monitor for InputReader and InputDispatcher."
* commit '
cb0af4f1b0709b236a030f41c75edd97cf0bf1fd':
Improve watchdog monitor for InputReader and InputDispatcher.
Jeff Brown [Sat, 28 Jan 2012 01:38:53 +0000 (17:38 -0800)]
am
2d2d7d6f: Merge "Implement a cancelation mechanism for queries."
* commit '
2d2d7d6f42fe22ecc2b1dc8bb96a19e503a61a20':
Implement a cancelation mechanism for queries.
Jeff Brown [Sat, 28 Jan 2012 01:37:31 +0000 (17:37 -0800)]
Merge "Improve watchdog monitor for InputReader and InputDispatcher."
Jeff Brown [Sat, 28 Jan 2012 01:37:24 +0000 (17:37 -0800)]
Merge "Implement a cancelation mechanism for queries."
Siva Velusamy [Fri, 27 Jan 2012 22:39:03 +0000 (14:39 -0800)]
gltrace: Use Unix Domain Socket rather than INET Socket
Export trace information via abstract Unix Domain Socket (UDS).
This allows tracing of applications without INTERNET permission,
and should be faster as well.
Change-Id: Iabb67fcc2bc2484afd8128af07dca723b81c52c6
Glenn Kasten [Sat, 28 Jan 2012 00:25:54 +0000 (16:25 -0800)]
am
30c918ce: Use final on new member variables
* commit '
30c918ce7fbe171944b28fc91b3f22b3d631872d':
Use final on new member variables
Alex Sakhartchouk [Fri, 27 Jan 2012 23:29:09 +0000 (15:29 -0800)]
Merge "Better constant names, removed unused code, general cleanup." into graphics-dev
Jean-Michel Trivi [Fri, 27 Jan 2012 22:53:22 +0000 (14:53 -0800)]
am
cf0c7d10: Merge "Bug
5567648 Request and abandon audio focus in calls"
* commit '
cf0c7d1031ea213c1b728aca972522afcd4a92c3':
Bug
5567648 Request and abandon audio focus in calls
Jean-Michel Trivi [Fri, 27 Jan 2012 22:50:28 +0000 (14:50 -0800)]
Merge "Bug
5567648 Request and abandon audio focus in calls"
Fabrice Di Meglio [Fri, 27 Jan 2012 22:44:02 +0000 (14:44 -0800)]
am
39d18f53: Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
* commit '
39d18f53b3ec721ecc5cc629b71f902b33504bea':
Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE
Fabrice Di Meglio [Fri, 27 Jan 2012 22:42:06 +0000 (14:42 -0800)]
Merge "Code cleaning: centralize use of #if USE_TEXT_LAYOUT_CACHE"
Jean-Michel Trivi [Fri, 27 Jan 2012 22:17:55 +0000 (14:17 -0800)]
am
11001c34: Merge "Bug
5567648 disassociate audio mode and audio focus"
* commit '
11001c344a37ac515328133f46b80a2c92e61b6c':
Bug
5567648 disassociate audio mode and audio focus
Jean-Michel Trivi [Fri, 27 Jan 2012 22:15:37 +0000 (14:15 -0800)]
Merge "Bug
5567648 disassociate audio mode and audio focus"
Glenn Kasten [Fri, 27 Jan 2012 22:12:42 +0000 (14:12 -0800)]
am
b975ae45: Merge "Remove optional LVMX service"
* commit '
b975ae45cb246457c350863975a3ef5b3baa7fb4':
Remove optional LVMX service
Glenn Kasten [Fri, 27 Jan 2012 22:11:16 +0000 (14:11 -0800)]
Merge "Remove optional LVMX service"
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:58:03 +0000 (13:58 -0800)]
am
dc8668c8: am
97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '
dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
Wi-Fi: Handle disconnect in middle of DHCP operation
Gilles Debunne [Fri, 27 Jan 2012 21:57:16 +0000 (13:57 -0800)]
am
566e8baf: Merge "Fix for IOOB when suggestions have disappeared"
* commit '
566e8baf43a08b1000b8c4c24fb14fe94e46394d':
Fix for IOOB when suggestions have disappeared