OSDN Git Service
Dave Burke [Tue, 15 Nov 2011 12:11:13 +0000 (04:11 -0800)]
am
28a5ec96: am
2cfb873c: am
9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
* commit '
28a5ec9613a824d2ec15ce5e5cec77a6fcf444d5':
Revert "Discard framebuffer rendering queues when discarding layers"
John Wang [Tue, 15 Nov 2011 12:11:08 +0000 (04:11 -0800)]
am
196c215a: am
6504d74b: am
72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '
196c215a8b89499a353cf023488a04888431a6b0':
[maguro] Fix STK issues
Mathias Agopian [Tue, 15 Nov 2011 12:11:01 +0000 (04:11 -0800)]
am
d8fa1ad4: am
738d8cae: am
c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
* commit '
d8fa1ad4523b6c04cab663ff4b65181fc00594d9':
Define, document, and test the behavior of very large SurfaceTextures
Glenn Kasten [Tue, 15 Nov 2011 12:10:50 +0000 (04:10 -0800)]
am
527c44e8: Merge "Don\'t check return value of new for being == null"
* commit '
527c44e8a455dd0fdef1aeb6d7d8f99bb0839295':
Don't check return value of new for being == null
Alex Sakhartchouk [Tue, 15 Nov 2011 12:10:47 +0000 (04:10 -0800)]
am
b14d771c: am
f579bb92: am
cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
* commit '
b14d771cf07479e3186a167a219fb2d42d8d4d30':
Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
Dave Burke [Mon, 14 Nov 2011 20:30:04 +0000 (12:30 -0800)]
am
2cfb873c: am
9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
* commit '
2cfb873c9f0b56f2c7d694a21c968511223933af':
Revert "Discard framebuffer rendering queues when discarding layers"
Dave Burke [Mon, 14 Nov 2011 20:27:34 +0000 (12:27 -0800)]
am
9d66da8a: Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
* commit '
9d66da8ae61a8520f46ee7df3cbb374852d9da91':
Revert "Discard framebuffer rendering queues when discarding layers"
Dave Burke [Mon, 14 Nov 2011 20:25:53 +0000 (12:25 -0800)]
Merge "Revert "Discard framebuffer rendering queues when discarding layers"" into ics-mr1
John Wang [Mon, 14 Nov 2011 20:14:09 +0000 (12:14 -0800)]
am
6504d74b: am
72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '
6504d74b8f7b98f7c2d5fb550042c644510d5f34':
[maguro] Fix STK issues
John Wang [Mon, 14 Nov 2011 20:11:35 +0000 (12:11 -0800)]
am
72a31ab9: Merge "[maguro] Fix STK issues" into ics-mr1
* commit '
72a31ab98f8687aa48fce028d54e79929780a302':
[maguro] Fix STK issues
John Wang [Mon, 14 Nov 2011 20:10:16 +0000 (12:10 -0800)]
Merge "[maguro] Fix STK issues" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 19:54:38 +0000 (11:54 -0800)]
am
738d8cae: am
c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
* commit '
738d8cae2239d194429676f2889cfae3c8f7ba08':
Define, document, and test the behavior of very large SurfaceTextures
Mathias Agopian [Mon, 14 Nov 2011 19:51:48 +0000 (11:51 -0800)]
am
c93a151f: Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
* commit '
c93a151fde7d616c22b86ae458b3d015e3820d5e':
Define, document, and test the behavior of very large SurfaceTextures
Mathias Agopian [Mon, 14 Nov 2011 19:49:42 +0000 (11:49 -0800)]
Merge "Define, document, and test the behavior of very large SurfaceTextures" into ics-mr1
Glenn Kasten [Mon, 14 Nov 2011 18:50:33 +0000 (10:50 -0800)]
Merge "Don't check return value of new for being == null"
Alex Sakhartchouk [Mon, 14 Nov 2011 18:39:08 +0000 (10:39 -0800)]
am
f579bb92: am
cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
* commit '
f579bb92c2032cd27aef72a1654c006933b22bbd':
Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
Alex Sakhartchouk [Mon, 14 Nov 2011 18:37:21 +0000 (10:37 -0800)]
am
cde433c5: Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
* commit '
cde433c5f75fd4ac2ab31e9fc34654750d1e83f8':
Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context.
Alex Sakhartchouk [Mon, 14 Nov 2011 18:35:08 +0000 (10:35 -0800)]
Merge "Fixing a race condition in RSSurfaceView. Bug
5601083 When destroy is called shortly after creation, RS tries to set a surface on a partially destroyed context." into ics-mr1
Eric Laurent [Mon, 14 Nov 2011 16:43:49 +0000 (08:43 -0800)]
am
02e1c6fe: am
25924f8f: am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
02e1c6fe23c6eb79e0618d218bce647826a1ac0b':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:41:40 +0000 (08:41 -0800)]
am
25924f8f: am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:39:33 +0000 (08:39 -0800)]
am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
Mathias Agopian [Mon, 14 Nov 2011 15:52:49 +0000 (07:52 -0800)]
am
3f511aaf: am
a16ee939: am
28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
* commit '
3f511aaf1cb9dfa69e2f4225a5bd41bec0864cc7':
Discard framebuffer rendering queues when discarding layers Bug #
5581817
Scott Main [Mon, 14 Nov 2011 15:52:47 +0000 (07:52 -0800)]
am
e7a8aae0: am
807c07b5: am
2af9f21c: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
e7a8aae0a60cdb251fb83eba2ccb35c5f00a0cdf':
Jeff Brown [Mon, 14 Nov 2011 15:52:45 +0000 (07:52 -0800)]
am
91a0fb5a: am
ffa5d463: am
6f0464e7: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
91a0fb5af9bc9649341215466745640593960041':
Adam Powell [Mon, 14 Nov 2011 15:52:44 +0000 (07:52 -0800)]
am
a53e431d: am
ec44bdaa: (-s ours) am
771d0c99: am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
a53e431d6c87b67854bf1f324fab0e2c4f1cdcac':
Robert Ly [Mon, 14 Nov 2011 15:52:42 +0000 (07:52 -0800)]
Robert Ly [Mon, 14 Nov 2011 15:52:40 +0000 (07:52 -0800)]
am
e01affd0: am
fafda521: am
83c16e25: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
e01affd0c9bf7a1ec626790ceab32141404e6a0f':
Adam Powell [Mon, 14 Nov 2011 15:52:39 +0000 (07:52 -0800)]
am
cd6faca8: am
b22eec57: am
a8743f15: Fix bug
5425280 - Two ActionBar icons show up
* commit '
cd6faca83678eaa8f66de2a082e1611e32ba3796':
Fix bug
5425280 - Two ActionBar icons show up
Mathias Agopian [Mon, 14 Nov 2011 15:49:07 +0000 (07:49 -0800)]
am
a16ee939: am
28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
* commit '
a16ee9390e1fcea8ff7cbefd253659c37f2999a3':
Discard framebuffer rendering queues when discarding layers Bug #
5581817
Scott Main [Mon, 14 Nov 2011 15:49:06 +0000 (07:49 -0800)]
am
807c07b5: am
2af9f21c: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
807c07b564564b6f5cf3711e4743de9c25a38175':
Jeff Brown [Mon, 14 Nov 2011 15:49:04 +0000 (07:49 -0800)]
am
ffa5d463: am
6f0464e7: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
ffa5d463c36e2127ff10a03ee49f0677567c02c1':
Adam Powell [Mon, 14 Nov 2011 15:49:03 +0000 (07:49 -0800)]
am
ec44bdaa: (-s ours) am
771d0c99: am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
ec44bdaaadcceaae8ab6fe5c4bd17d59fc00d7e3':
Robert Ly [Mon, 14 Nov 2011 15:49:01 +0000 (07:49 -0800)]
Robert Ly [Mon, 14 Nov 2011 15:49:00 +0000 (07:49 -0800)]
am
fafda521: am
83c16e25: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
fafda5210f54705fdf36baeee0064d46e6e1994e':
Adam Powell [Mon, 14 Nov 2011 15:48:58 +0000 (07:48 -0800)]
am
b22eec57: am
a8743f15: Fix bug
5425280 - Two ActionBar icons show up
* commit '
b22eec57d559fc9dd5663abdc37d6b6e6a4f641f':
Fix bug
5425280 - Two ActionBar icons show up
Mathias Agopian [Mon, 14 Nov 2011 15:46:03 +0000 (07:46 -0800)]
am
28587497: Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
* commit '
2858749704ea7b130499cf2ac7b3e1c3331f1582':
Discard framebuffer rendering queues when discarding layers Bug #
5581817
Scott Main [Mon, 14 Nov 2011 15:46:03 +0000 (07:46 -0800)]
am
2af9f21c: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
2af9f21c664d4579b5f51283a320a7d1fba13a75':
Jeff Brown [Mon, 14 Nov 2011 15:46:02 +0000 (07:46 -0800)]
am
6f0464e7: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
6f0464e79d6d41d8255a6b0b6695fa7f67a0f65f':
Adam Powell [Mon, 14 Nov 2011 15:46:01 +0000 (07:46 -0800)]
am
771d0c99: am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
771d0c99f6433c3ad7063cdfa847c9476ef0453c':
Robert Ly [Mon, 14 Nov 2011 15:46:01 +0000 (07:46 -0800)]
Robert Ly [Mon, 14 Nov 2011 15:46:00 +0000 (07:46 -0800)]
am
83c16e25: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
83c16e2577705b577d2c74d45b0e55a50a0806e2':
Adam Powell [Mon, 14 Nov 2011 15:46:00 +0000 (07:46 -0800)]
am
a8743f15: Fix bug
5425280 - Two ActionBar icons show up
* commit '
a8743f152aac4a8ef97c79bdad5232614453ce2a':
Fix bug
5425280 - Two ActionBar icons show up
Kristian Monsen [Mon, 14 Nov 2011 15:31:15 +0000 (07:31 -0800)]
Kristian Monsen [Mon, 14 Nov 2011 12:29:38 +0000 (04:29 -0800)]
am
10a09dc1: Merge "Removing the ability to get native instrumentation as part of nav dump"
* commit '
10a09dc16387db216d5756309e3695096aedd9d0':
Removing the ability to get native instrumentation as part of nav dump
Kristian Monsen [Mon, 14 Nov 2011 12:28:32 +0000 (04:28 -0800)]
Merge "Removing the ability to get native instrumentation as part of nav dump"
Mathias Agopian [Mon, 14 Nov 2011 08:52:09 +0000 (00:52 -0800)]
Merge "Discard framebuffer rendering queues when discarding layers Bug #
5581817" into ics-mr1
Scott Main [Sat, 12 Nov 2011 04:40:38 +0000 (20:40 -0800)]
am
e3571f63: am
30870e32: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
e3571f633a825738d785b587e91798a3d0876740':
Docs: update state list drawable with state_activated and revise selected/focused
Jeff Brown [Sat, 12 Nov 2011 04:40:36 +0000 (20:40 -0800)]
am
ad169f49: am
0e4669c8: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
ad169f49af9fac1b80faa124496103dff2ac29f4':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 04:40:34 +0000 (20:40 -0800)]
am
5a21ca5b: am
811959f4: (-s ours) am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
5a21ca5bb6cf634944d3c2cfdc432221c71827d4':
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Robert Ly [Sat, 12 Nov 2011 04:40:33 +0000 (20:40 -0800)]
Robert Ly [Sat, 12 Nov 2011 04:40:31 +0000 (20:40 -0800)]
am
17161d7a: am
6be50a40: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
17161d7a549c34828d3bd377f5dd65b7a46ec1f0':
docs: ndk r7 rel notes
Scott Main [Sat, 12 Nov 2011 04:37:14 +0000 (20:37 -0800)]
am
30870e32: am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
30870e32de4d7338d0aa957458ec63df9806f9da':
Docs: update state list drawable with state_activated and revise selected/focused
Jeff Brown [Sat, 12 Nov 2011 04:37:12 +0000 (20:37 -0800)]
am
0e4669c8: am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
0e4669c81009cea51d9d7b42b7ff665f44e78aa6':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 04:37:10 +0000 (20:37 -0800)]
am
811959f4: (-s ours) am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
811959f474f1b39b655935aa0ad3ab70125c992c':
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Robert Ly [Sat, 12 Nov 2011 04:37:08 +0000 (20:37 -0800)]
Robert Ly [Sat, 12 Nov 2011 04:37:06 +0000 (20:37 -0800)]
am
6be50a40: am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
6be50a40549a16a3aa3fc1d4360483ab3e898501':
docs: ndk r7 rel notes
Scott Main [Sat, 12 Nov 2011 04:34:51 +0000 (20:34 -0800)]
am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
Docs: update state list drawable with state_activated and revise selected/focused
Jeff Brown [Sat, 12 Nov 2011 04:34:48 +0000 (20:34 -0800)]
am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 04:34:45 +0000 (20:34 -0800)]
am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
6200a4b7eb07507055af93ec1a054640a39b9751':
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Robert Ly [Sat, 12 Nov 2011 04:34:43 +0000 (20:34 -0800)]
Robert Ly [Sat, 12 Nov 2011 04:34:39 +0000 (20:34 -0800)]
am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
Scott Main [Sat, 12 Nov 2011 03:22:07 +0000 (19:22 -0800)]
am
19b1c12b: Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
* commit '
19b1c12b5eb3417e9f56810cc08ee1e560da0a99':
Docs: update state list drawable with state_activated and revise selected/focused
Jeff Brown [Sat, 12 Nov 2011 03:22:04 +0000 (19:22 -0800)]
am
f1f0c873: Fix bug in TextLayoutCacheKey handling embedded nulls.
* commit '
f1f0c873b1d119a19342cb67ca77b59607951659':
Fix bug in TextLayoutCacheKey handling embedded nulls.
Adam Powell [Sat, 12 Nov 2011 03:22:02 +0000 (19:22 -0800)]
am
6200a4b7: Merge "DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don\'t try to open an overflow menu under invalid circumstances." into ics-mr0
* commit '
6200a4b7eb07507055af93ec1a054640a39b9751':
DO NOT MERGE Cherry pick from ics-mr1 - Bug
5275928 - Don't try to open an overflow menu under invalid circumstances.
Robert Ly [Sat, 12 Nov 2011 03:22:01 +0000 (19:22 -0800)]
Robert Ly [Sat, 12 Nov 2011 03:17:23 +0000 (19:17 -0800)]
am
5ad6f646: Merge "docs: ndk r7 rel notes" into ics-mr0
* commit '
5ad6f646fbe692b94961df6472bec2b8bd1ea382':
docs: ndk r7 rel notes
Mathias Agopian [Thu, 10 Nov 2011 22:34:26 +0000 (14:34 -0800)]
Define, document, and test the behavior of very large SurfaceTextures
updateTexImage() now throws a runtime exception when its native
counterpart fails
Bug:
5506633
Change-Id: I151a6f685d465966e7df4df624412ab2da62e95f
Scott Main [Sat, 12 Nov 2011 01:17:23 +0000 (17:17 -0800)]
Merge "Docs: update state list drawable with state_activated and revise selected/focused" into ics-mr0
Fabrice Di Meglio [Sat, 12 Nov 2011 01:00:13 +0000 (17:00 -0800)]
am
86614895: Merge "Improve the logging in TextLayoutCache."
* commit '
8661489545eaa4aac641a8bc1a24b1647258a62e':
Improve the logging in TextLayoutCache.
Fabrice Di Meglio [Sat, 12 Nov 2011 00:58:10 +0000 (16:58 -0800)]
Merge "Improve the logging in TextLayoutCache."
Svetoslav Ganov [Sat, 12 Nov 2011 00:55:42 +0000 (16:55 -0800)]
am
531ded55: Merge "Added missing comments in Instrumentation#sendStringSync"
* commit '
531ded5514981f2ca686e1c0f7b182dd9f43a66f':
Added missing comments in Instrumentation#sendStringSync
Svetoslav Ganov [Sat, 12 Nov 2011 00:52:37 +0000 (16:52 -0800)]
Merge "Added missing comments in Instrumentation#sendStringSync"
Svetoslav Ganov [Sat, 12 Nov 2011 00:47:48 +0000 (16:47 -0800)]
am
55c6ccce: Merge "Instrumentation sendStringSync(String) may try to inject obsolete events."
* commit '
55c6ccce95e23865b1a2ebe4e0891124da383466':
Instrumentation sendStringSync(String) may try to inject obsolete events.
Svetoslav Ganov [Sat, 12 Nov 2011 00:46:07 +0000 (16:46 -0800)]
Merge "Instrumentation sendStringSync(String) may try to inject obsolete events."
Christopher Tate [Sat, 12 Nov 2011 00:28:14 +0000 (16:28 -0800)]
am
c45fa2a8: am
0fbd9eba: am
c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit '
c45fa2a823e9ddcdc94be609dcd568e67c56ab56':
XML parsing optimizations
Dianne Hackborn [Sat, 12 Nov 2011 00:28:10 +0000 (16:28 -0800)]
am
1093c9ac: am
7ddf38a5: am
be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '
1093c9acc57af7d9805ddcd50f6f3da024b4ed3a':
Make activity manager more robust in the face of app activity leaks.
Christopher Tate [Sat, 12 Nov 2011 00:24:19 +0000 (16:24 -0800)]
am
0fbd9eba: am
c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit '
0fbd9ebab891530290b4d52fd5e81f6b4d7278d8':
XML parsing optimizations
Christopher Tate [Sat, 12 Nov 2011 00:21:28 +0000 (16:21 -0800)]
am
c51bb4d3: Merge "XML parsing optimizations" into ics-mr1
* commit '
c51bb4d394dd47e48abc8a6d9cbc740f821546ff':
XML parsing optimizations
Christopher Tate [Sat, 12 Nov 2011 00:19:29 +0000 (16:19 -0800)]
Merge "XML parsing optimizations" into ics-mr1
Dianne Hackborn [Sat, 12 Nov 2011 00:16:31 +0000 (16:16 -0800)]
am
7ddf38a5: am
be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '
7ddf38a5bf833f90057b0795dd9af6c61d3cf2d5':
Make activity manager more robust in the face of app activity leaks.
Dianne Hackborn [Sat, 12 Nov 2011 00:13:46 +0000 (16:13 -0800)]
am
be70785f: Make activity manager more robust in the face of app activity leaks.
* commit '
be70785f9b2dbd2c52fd8676d99bc64b22784201':
Make activity manager more robust in the face of app activity leaks.
Jeff Brown [Sat, 12 Nov 2011 00:01:40 +0000 (16:01 -0800)]
am
5043441c: Merge "Include the build fingerprint in bug reports."
* commit '
5043441c4f3f0bd28834796838011eb48ccaec96':
Include the build fingerprint in bug reports.
Jeff Brown [Sat, 12 Nov 2011 00:01:38 +0000 (16:01 -0800)]
am
0f6ba926: Merge "Seems to break text views all over. Particularly noticeable is that the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character."
* commit '
0f6ba9267ff4ef8f87aecdfc2bb8fb7e2ba2e42e':
Seems to break text views all over. Particularly noticeable is that the labels in launcher icons appear left-justified. Multi-line text fields also wrap after every character.
Robert Greenwalt [Sat, 12 Nov 2011 00:01:32 +0000 (16:01 -0800)]
am
7a8e78f4: am
3100e2b0: am
24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '
7a8e78f4d3f15e65ebc700dff463e7838196986d':
Tone down Tethering logs.
Dianne Hackborn [Sat, 12 Nov 2011 00:01:24 +0000 (16:01 -0800)]
am
942d51f6: am
0b554bab: am
d400d03f: Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
* commit '
942d51f6a6c39a6e70b8fab026d46261a918797e':
Fix issue #
5595933: GREF leak due to race condition in...
Christopher Tate [Sat, 12 Nov 2011 00:01:23 +0000 (16:01 -0800)]
am
951aa9d8: am
9acae658: am
847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '
951aa9d8ea71082f4ae4c46c41616e79619401fd':
Localized optimizations in views and bitmaps
Nick Pelly [Sat, 12 Nov 2011 00:01:16 +0000 (16:01 -0800)]
am
34059a91: am
4780228f: am
48b651cb: Merge "Changes for access control." into ics-mr1
* commit '
34059a912520e6c145f18373c4300e4a567da89d':
Changes for access control.
Matthew Xie [Sat, 12 Nov 2011 00:01:07 +0000 (16:01 -0800)]
am
44ada184: am
5a8ad071: am
a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit '
44ada1845d721500e4bbddabfd70c8188cf80dbf':
Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
Peter Ng [Sat, 12 Nov 2011 00:01:05 +0000 (16:01 -0800)]
am
6c934436: am
b88cd4be: am
20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '
6c934436d4d1d6e87de6ff875ba05322b5c1d3b0':
Making the quicksettings notifications icon the right opacity
Dianne Hackborn [Sat, 12 Nov 2011 00:00:39 +0000 (16:00 -0800)]
am
4bae1f66: am
8f45e3e2: am
be425cce: Merge "Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit '
4bae1f66021a76a9e2c0598f9e7f293f56178405':
Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it
James Dong [Sat, 12 Nov 2011 00:00:37 +0000 (16:00 -0800)]
am
c512fd06: am
9a176507: am
b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit '
c512fd065c2bb4f5d39bb13f45d3fb32370f6880':
Unhide the key to retriever location information in 3gp/mp4 files
Andreas Huber [Sat, 12 Nov 2011 00:00:35 +0000 (16:00 -0800)]
am
3dc44d9a: am
8a065423: am
23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '
3dc44d9afe72fc1975dcf7d8b883fc101047b2be':
Didn't mean to check this in...
Robert Greenwalt [Sat, 12 Nov 2011 00:00:33 +0000 (16:00 -0800)]
am
41904b1e: am
2c41bce3: am
424781e2: Fix NPE in ConnectivityService.
* commit '
41904b1e58c6faa4bc36e6dd2ab1b8c7e9bd1130':
Fix NPE in ConnectivityService.
Eric Laurent [Sat, 12 Nov 2011 00:00:31 +0000 (16:00 -0800)]
am
ff1fa5ef: am
2c29a5cf: am
1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '
ff1fa5ef933a7e3c5e00f39b196fc6d480e5c27d':
visualizer: reset buffer if playback is idle
Andreas Huber [Sat, 12 Nov 2011 00:00:29 +0000 (16:00 -0800)]
am
d8ad2fab: am
40461ee7: am
cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
* commit '
d8ad2fab90b4f6eb50ba9c45e140811bad848384':
Instead of asserting, signal a runtime error if the session doesn't contain
Andreas Huber [Sat, 12 Nov 2011 00:00:26 +0000 (16:00 -0800)]
am
5dd4c6bc: am
9a87a838: (-s ours) am
5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '
5dd4c6bcb4f477d5500c61fda9b460299d825975':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
Andreas Huber [Sat, 12 Nov 2011 00:00:24 +0000 (16:00 -0800)]
am
ff0bd468: am
9c981cd3: am
d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '
ff0bd468d8cf0f51c07927c758563a3f696c32a4':
Disconnect on socket error on the RTSP control connection.
Narayan Kamath [Sat, 12 Nov 2011 00:00:22 +0000 (16:00 -0800)]
am
e5fe1b30: am
405fcc87: am
754c72ed: Notifiy callers when a speech synthesis error occurs.
* commit '
e5fe1b302d68a1ca2ee3f16cdcbce276fe3d9776':
Notifiy callers when a speech synthesis error occurs.
Matthew Xie [Fri, 11 Nov 2011 23:59:57 +0000 (15:59 -0800)]
am
99164b42: Merge "Add more comments to the file header to explain the state diagram"
* commit '
99164b4209d9cd37a9389f566ab0beee6363b030':
Add more comments to the file header to explain the state diagram
OSDN Git Service
