OSDN Git Service
Jamie Gennis [Tue, 15 Nov 2011 19:29:47 +0000 (11:29 -0800)]
am
c38d40de: am
6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
* commit '
c38d40ded9810aa809489e080ee811bec86d546d':
EGL: add the ANDROID suffix to the blob cache ext
Jeff Brown [Tue, 15 Nov 2011 02:28:59 +0000 (18:28 -0800)]
Merge "Clean up GenerationCache."
Jamie Gennis [Tue, 15 Nov 2011 01:41:20 +0000 (17:41 -0800)]
am
6b228af6: Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
* commit '
6b228af6ff20b3f592db4ad5662e1bc401d09b4d':
EGL: add the ANDROID suffix to the blob cache ext
Jamie Gennis [Tue, 15 Nov 2011 01:36:46 +0000 (17:36 -0800)]
Merge "EGL: add the ANDROID suffix to the blob cache ext" into ics-mr1
Steven Ross [Tue, 15 Nov 2011 00:56:46 +0000 (16:56 -0800)]
Merge "Making KeyguardView slippery fixes
5501105"
Jim Miller [Tue, 15 Nov 2011 00:21:10 +0000 (16:21 -0800)]
am
3dd55677: am
ff95f657: Merge "Fix
5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '
3dd5567710168da330741cb4c4263cc03dd942f1':
Fix
5579440: Add transport control view to tablet unlock screens
Jim Miller [Tue, 15 Nov 2011 00:16:28 +0000 (16:16 -0800)]
am
ff95f657: Merge "Fix
5579440: Add transport control view to tablet unlock screens" into ics-mr1
* commit '
ff95f6572596c48b58f5a73d23b2273866ea3fab':
Fix
5579440: Add transport control view to tablet unlock screens
Jim Miller [Tue, 15 Nov 2011 00:14:07 +0000 (16:14 -0800)]
Merge "Fix
5579440: Add transport control view to tablet unlock screens" into ics-mr1
Tsu Chiang Chuang [Mon, 14 Nov 2011 22:41:05 +0000 (14:41 -0800)]
am
8340db9e: am
6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1
* commit '
8340db9e9b3363924b47f4d67d57ddb19a4c7702':
Adding mobile microbenchmark tests.
Tsu Chiang Chuang [Mon, 14 Nov 2011 22:38:31 +0000 (14:38 -0800)]
am
6a54a997: Merge "Adding mobile microbenchmark tests." into ics-mr1
* commit '
6a54a997e3dc71c5b9c5a1c7829bc3eb35404e92':
Adding mobile microbenchmark tests.
Adam Cohen [Mon, 14 Nov 2011 22:38:30 +0000 (14:38 -0800)]
am
621f9716: am
6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)" into ics-mr1
* commit '
621f971691e3e819ddcd95898f4f93498e00c2ad':
Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)
Jean-Michel Trivi [Mon, 14 Nov 2011 22:38:30 +0000 (14:38 -0800)]
am
9d36a995: am
258576a8: Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
* commit '
9d36a99582518ed1a7fb005382e0128479b43e18':
Fix
5607938 AudioFocusDeathHandler leaks GREF
Adam Cohen [Mon, 14 Nov 2011 22:35:57 +0000 (14:35 -0800)]
am
6066a2b4: Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)" into ics-mr1
* commit '
6066a2b4de36549b7d8fe36507b7254e501f0b28':
Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)
Tsu Chiang Chuang [Mon, 14 Nov 2011 22:35:42 +0000 (14:35 -0800)]
Merge "Adding mobile microbenchmark tests." into ics-mr1
Adam Cohen [Mon, 14 Nov 2011 22:33:06 +0000 (14:33 -0800)]
Merge "Fix uncaught exception in WindowManager#setWallpaperOffsets (issue
5613241)" into ics-mr1
Jean-Michel Trivi [Mon, 14 Nov 2011 20:33:20 +0000 (12:33 -0800)]
am
258576a8: Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
* commit '
258576a82c2293c3a988bf2dc6744fd8082421f9':
Fix
5607938 AudioFocusDeathHandler leaks GREF
Jean-Michel Trivi [Mon, 14 Nov 2011 20:31:10 +0000 (12:31 -0800)]
Merge "Fix
5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
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: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: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 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
Jeff Brown [Fri, 11 Nov 2011 23:40:13 +0000 (15:40 -0800)]
Clean up GenerationCache.
Use const references to keys and values where appropriate to avoid
copying them unnecessarily.
Deleted some dead code.
Simplified a few pieces that were doing unnecessary redundant work.
Change-Id: Ib2145b7094a40db2d679e05dafe050fe1e87b846
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 00:58:10 +0000 (16:58 -0800)]
Merge "Improve the logging in TextLayoutCache."
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:46:07 +0000 (16:46 -0800)]
Merge "Instrumentation sendStringSync(String) may try to inject obsolete events."
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 [Fri, 11 Nov 2011 23:41:05 +0000 (15:41 -0800)]
Merge "Include the build fingerprint in bug reports."
Jeff Brown [Fri, 11 Nov 2011 23:30:45 +0000 (15:30 -0800)]
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."
Adam Powell [Fri, 11 Nov 2011 22:54:02 +0000 (14:54 -0800)]
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
Robert Greenwalt [Fri, 11 Nov 2011 22:41:18 +0000 (14:41 -0800)]
am
3100e2b0: am
24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '
3100e2b01792e6868698e06ecf275f47f187d537':
Tone down Tethering logs.
Robert Greenwalt [Fri, 11 Nov 2011 22:38:34 +0000 (14:38 -0800)]
am
24597eb7: Merge "Tone down Tethering logs." into ics-mr1
* commit '
24597eb77e1a88994b83c5b1f45d5b72383943b8':
Tone down Tethering logs.
Robert Greenwalt [Fri, 11 Nov 2011 22:37:18 +0000 (14:37 -0800)]
Merge "Tone down Tethering logs." into ics-mr1
Dianne Hackborn [Fri, 11 Nov 2011 22:28:57 +0000 (14:28 -0800)]
am
0b554bab: am
d400d03f: Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
* commit '
0b554bab585fe2d7eaaca8692106e0cbbc3aabe4':
Fix issue #
5595933: GREF leak due to race condition in...
Christopher Tate [Fri, 11 Nov 2011 22:28:55 +0000 (14:28 -0800)]
am
9acae658: am
847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '
9acae658e179796beee91d673f9f70af49ae3c9b':
Localized optimizations in views and bitmaps
Dianne Hackborn [Fri, 11 Nov 2011 22:26:30 +0000 (14:26 -0800)]
am
d400d03f: Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
* commit '
d400d03f4a6384449f8b0d3c8a9aa7e1e8aa5a16':
Fix issue #
5595933: GREF leak due to race condition in...
Christopher Tate [Fri, 11 Nov 2011 22:26:28 +0000 (14:26 -0800)]
am
847fbbea: Merge "Localized optimizations in views and bitmaps" into ics-mr1
* commit '
847fbbeaf9e3ba187a45d0a631f0c087ce25b7f6':
Localized optimizations in views and bitmaps
Dianne Hackborn [Fri, 11 Nov 2011 22:24:58 +0000 (14:24 -0800)]
Merge "Fix issue #
5595933: GREF leak due to race condition in..." into ics-mr1
Christopher Tate [Fri, 11 Nov 2011 22:24:53 +0000 (14:24 -0800)]
Merge "Localized optimizations in views and bitmaps" into ics-mr1
Nick Pelly [Fri, 11 Nov 2011 21:59:09 +0000 (13:59 -0800)]
am
4780228f: am
48b651cb: Merge "Changes for access control." into ics-mr1
* commit '
4780228fb2476304e29ddf9a118c460ac4eb96ee':
Changes for access control.
Matthew Xie [Fri, 11 Nov 2011 21:42:42 +0000 (13:42 -0800)]
am
5a8ad071: am
a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit '
5a8ad0717dad332cab4b2d9f7a6030b76cb8d6bb':
Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
Peter Ng [Fri, 11 Nov 2011 21:42:36 +0000 (13:42 -0800)]
am
b88cd4be: am
20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '
b88cd4bea3bd1dc3497b79e6da187ae0f858f266':
Making the quicksettings notifications icon the right opacity
Jamie Gennis [Wed, 9 Nov 2011 23:35:34 +0000 (15:35 -0800)]
EGL: add the ANDROID suffix to the blob cache ext
This change adds the ANDROID suffix to the all the types and functions
defined by the EGL_ANDROID_blob_cache extension.
Change-Id: I087875b96d9a7053efb9c8d5614f9f765eed799d
Nick Pelly [Fri, 11 Nov 2011 21:08:37 +0000 (13:08 -0800)]
am
48b651cb: Merge "Changes for access control." into ics-mr1
* commit '
48b651cb2a3afab979c2a46185fd7edfa5424387':
Changes for access control.
Nick Pelly [Fri, 11 Nov 2011 21:06:44 +0000 (13:06 -0800)]
Merge "Changes for access control." into ics-mr1
Matthew Xie [Fri, 11 Nov 2011 20:18:22 +0000 (12:18 -0800)]
am
a303f0ec: Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
* commit '
a303f0ecfc5472d3b2e65cb7de9f7413a9a83d9a':
Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect
Matthew Xie [Fri, 11 Nov 2011 20:16:41 +0000 (12:16 -0800)]
Merge "Send CONNECT_OTHER_PROFILE to Device profile for hfp and a2dp incoming connect" into ics-mr1
Robert Ly [Fri, 11 Nov 2011 20:06:39 +0000 (12:06 -0800)]
Merge "docs: ndk r7 rel notes" into ics-mr0
Peter Ng [Fri, 11 Nov 2011 19:59:40 +0000 (11:59 -0800)]
am
20d8c5ed: Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
* commit '
20d8c5ed96d6fb81d14cbce5221025ed6c954d6e':
Making the quicksettings notifications icon the right opacity
Peter Ng [Fri, 11 Nov 2011 19:57:41 +0000 (11:57 -0800)]
Merge "Making the quicksettings notifications icon the right opacity" into ics-mr1
Dianne Hackborn [Fri, 11 Nov 2011 19:51:21 +0000 (11:51 -0800)]
am
8f45e3e2: am
be425cce: Merge "Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it" into ics-mr1
* commit '
8f45e3e280fa84494d5d45c73697645d20dea101':
Fix issue #
5522658: Menu button shown on lock screen if app underneath requests it
James Dong [Fri, 11 Nov 2011 19:51:19 +0000 (11:51 -0800)]
am
9a176507: am
b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit '
9a176507a96ceb3640a56a5449e96fc3e406a765':
Unhide the key to retriever location information in 3gp/mp4 files
OSDN Git Service
