OSDN Git Service
Gilles Debunne [Tue, 15 Nov 2011 21:07:14 +0000 (13:07 -0800)]
am
7bc6600e: am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
7bc6600e60688ea37ee7f18b82cb16677c0f5e74':
Clean-up in TextView
John Reck [Tue, 15 Nov 2011 21:07:11 +0000 (13:07 -0800)]
am
6a622c56: am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
6a622c5608e3f67efb7ba6a346ea4d8cfa5267ec':
Call onScrollChanged when scrolling layers
Hong Teng [Tue, 15 Nov 2011 21:07:07 +0000 (13:07 -0800)]
am
716747f7: am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
716747f7cb29b45e41c2870f12d39095f4ed80c8':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Daniel Sandler [Tue, 15 Nov 2011 21:06:59 +0000 (13:06 -0800)]
am
50fb8a29: am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
50fb8a29f00e4414ef4961c4d2d6afca9ddf1659':
Bring back the 'more notifications' icon.
Jean-Michel Trivi [Tue, 15 Nov 2011 21:06:57 +0000 (13:06 -0800)]
am
87597d9c: am
538dc6ac: Merge "Fix
5615747 Don\'t leak remote control client death handlers" into ics-mr1
* commit '
87597d9ce00691f05703f728c17548df2bbc9cc2':
Fix
5615747 Don't leak remote control client death handlers
Wu-cheng Li [Tue, 15 Nov 2011 21:06:51 +0000 (13:06 -0800)]
am
4e1fed76: am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
4e1fed76c19cc9656af55e57dc57979324322593':
Improve camera face detection javadoc.
Michael Jurka [Tue, 15 Nov 2011 19:30:36 +0000 (11:30 -0800)]
am
729a9afe: am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
729a9afe44c21cbe4e10ca4d6ba400641cc75cbc':
Updating recent apps visuals on tablet
Jeff Sharkey [Tue, 15 Nov 2011 19:30:34 +0000 (11:30 -0800)]
am
bc03c74c: am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
bc03c74c485669695805944a655795a6f9890956':
Conservatively trim data usage stats.
Nick Pelly [Tue, 15 Nov 2011 19:30:22 +0000 (11:30 -0800)]
am
26eeedce: am
b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
* commit '
26eeedceb12fa4d293f6e987115f0e2de54947b8':
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
Adam Powell [Tue, 15 Nov 2011 19:30:13 +0000 (11:30 -0800)]
am
5d536c94: am
539bcca9: Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
* commit '
5d536c945da075036f151e5dbac86d74d32e2fc9':
Fix bug
5594320 - Overlay action bar decor layout causes two measure passes
Nick Pelly [Tue, 15 Nov 2011 19:30:10 +0000 (11:30 -0800)]
am
fb52c474: am
a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit '
fb52c4747687819238eb4570ee7d424842c6159f':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Dianne Hackborn [Tue, 15 Nov 2011 19:30:01 +0000 (11:30 -0800)]
am
f1c78890: am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
f1c78890dc703f44227b556e71624bed7eef95a1':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 19:29:59 +0000 (11:29 -0800)]
am
642de92b: am
9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1
* commit '
642de92b3500446ab2d2a84fbe4ff9c083e8c1af':
Fix races when content providers are acquired and released.
Dianne Hackborn [Tue, 15 Nov 2011 19:29:57 +0000 (11:29 -0800)]
am
74710e50: am
f10a5364: Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
* commit '
74710e5041045251c43ff408641ec6818d23f985':
Maybe fix issue #
5405788: Device continuously opening and closing...
Daisuke Miyakawa [Tue, 15 Nov 2011 19:29:51 +0000 (11:29 -0800)]
am
f2213aca: am
d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit '
f2213acaae5073ea3b4f3f566f0e8c7dc976765b':
Allow ContactsProvider to remove dulicates
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
Gilles Debunne [Tue, 15 Nov 2011 18:02:15 +0000 (10:02 -0800)]
am
8a440477: Merge "Clean-up in TextView" into ics-mr1
* commit '
8a440477fd203d74b73b32dc2b357f07dfc36067':
Clean-up in TextView
Gilles Debunne [Tue, 15 Nov 2011 17:59:45 +0000 (09:59 -0800)]
Merge "Clean-up in TextView" into ics-mr1
John Reck [Tue, 15 Nov 2011 17:58:48 +0000 (09:58 -0800)]
am
a0c6bf5a: Merge "Call onScrollChanged when scrolling layers" into ics-mr1
* commit '
a0c6bf5af6af4b0fd59347b78d3a507c416a46e6':
Call onScrollChanged when scrolling layers
John Reck [Tue, 15 Nov 2011 17:56:17 +0000 (09:56 -0800)]
Merge "Call onScrollChanged when scrolling layers" into ics-mr1
Hong Teng [Tue, 15 Nov 2011 17:45:29 +0000 (09:45 -0800)]
am
481ffa50: Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
* commit '
481ffa505bb1d8f5089ea98e3b5960d409b6819c':
Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Daniel Sandler [Tue, 15 Nov 2011 17:22:40 +0000 (09:22 -0800)]
am
ce33622a: Merge "Bring back the \'more notifications\' icon." into ics-mr1
* commit '
ce33622aed7fb25a14ef957cdc78b78cc4602be9':
Bring back the 'more notifications' icon.
Daniel Sandler [Tue, 15 Nov 2011 17:20:56 +0000 (09:20 -0800)]
Merge "Bring back the 'more notifications' icon." into ics-mr1
Jean-Michel Trivi [Tue, 15 Nov 2011 16:58:55 +0000 (08:58 -0800)]
am
538dc6ac: Merge "Fix
5615747 Don\'t leak remote control client death handlers" into ics-mr1
* commit '
538dc6acfd14ea59f0b294531f9417ca04ca621f':
Fix
5615747 Don't leak remote control client death handlers
Jean-Michel Trivi [Tue, 15 Nov 2011 16:56:55 +0000 (08:56 -0800)]
Merge "Fix
5615747 Don't leak remote control client death handlers" into ics-mr1
Wu-cheng Li [Tue, 15 Nov 2011 14:16:21 +0000 (06:16 -0800)]
am
b90a70d1: Merge "Improve camera face detection javadoc." into ics-mr1
* commit '
b90a70d1542edd5a95e73b75192e6eb5a66401cc':
Improve camera face detection javadoc.
Wu-cheng Li [Tue, 15 Nov 2011 14:14:11 +0000 (06:14 -0800)]
Merge "Improve camera face detection javadoc." into ics-mr1
Michael Jurka [Tue, 15 Nov 2011 07:55:12 +0000 (23:55 -0800)]
am
4b7494e0: Merge "Updating recent apps visuals on tablet" into ics-mr1
* commit '
4b7494e07a44c0aa363379be463de70455a895f3':
Updating recent apps visuals on tablet
Michael Jurka [Tue, 15 Nov 2011 07:53:34 +0000 (23:53 -0800)]
Merge "Updating recent apps visuals on tablet" into ics-mr1
Jeff Sharkey [Tue, 15 Nov 2011 07:39:46 +0000 (23:39 -0800)]
am
d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit '
d968670d8369e5d92ba9b7a45b3804d692a05a4e':
Conservatively trim data usage stats.
Jeff Sharkey [Tue, 15 Nov 2011 07:37:17 +0000 (23:37 -0800)]
Merge "Conservatively trim data usage stats." into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 04:16:07 +0000 (20:16 -0800)]
am
b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
* commit '
b3b66af2b5b4ccca1f507290ab6f138a3cbffc3e':
Move nfc-extras tests into frameworks/base/nfc-extras/tests.
Nick Pelly [Tue, 15 Nov 2011 04:14:11 +0000 (20:14 -0800)]
Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1
Adam Powell [Tue, 15 Nov 2011 03:49:39 +0000 (19:49 -0800)]
am
539bcca9: Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
* commit '
539bcca99d00166303245cd8137f49f29ff3f08e':
Fix bug
5594320 - Overlay action bar decor layout causes two measure passes
Adam Powell [Tue, 15 Nov 2011 03:47:55 +0000 (19:47 -0800)]
Merge "Fix bug
5594320 - Overlay action bar decor layout causes two measure passes" into ics-mr1
Nick Pelly [Tue, 15 Nov 2011 03:40:46 +0000 (19:40 -0800)]
am
a26cf301: Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
* commit '
a26cf3011157eb94fa2766e76fa0096628c16c18':
Enforce 1-1 relationship between context and NfcAdapterExtras.
Nick Pelly [Tue, 15 Nov 2011 03:39:09 +0000 (19:39 -0800)]
Merge "Enforce 1-1 relationship between context and NfcAdapterExtras." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:40:13 +0000 (18:40 -0800)]
am
91c2b5ce: Merge "Improve low memory reporting." into ics-mr1
* commit '
91c2b5cebe981fb894b7e6f053a8593c1d9db80f':
Improve low memory reporting.
Jeff Brown [Tue, 15 Nov 2011 02:37:47 +0000 (18:37 -0800)]
am
9058435d: Merge "Fix races when content providers are acquired and released." into ics-mr1
* commit '
9058435dc1a741030c042c4d6f2512f5d1605e5d':
Fix races when content providers are acquired and released.
Dianne Hackborn [Tue, 15 Nov 2011 02:37:46 +0000 (18:37 -0800)]
am
f10a5364: Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
* commit '
f10a53646044da31e73f5393d929c603871d4a28':
Maybe fix issue #
5405788: Device continuously opening and closing...
Dianne Hackborn [Tue, 15 Nov 2011 02:36:50 +0000 (18:36 -0800)]
Merge "Improve low memory reporting." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 02:35:57 +0000 (18:35 -0800)]
Merge "Fix races when content providers are acquired and released." into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 02:35:46 +0000 (18:35 -0800)]
Merge "Maybe fix issue #
5405788: Device continuously opening and closing..." into ics-mr1
Jeff Brown [Tue, 15 Nov 2011 02:28:59 +0000 (18:28 -0800)]
Merge "Clean up GenerationCache."
Daisuke Miyakawa [Tue, 15 Nov 2011 01:56:47 +0000 (17:56 -0800)]
am
d8f5e6ba: Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
* commit '
d8f5e6badb0dc11055508b83f20e48c82a7058bd':
Allow ContactsProvider to remove dulicates
Daisuke Miyakawa [Tue, 15 Nov 2011 01:54:17 +0000 (17:54 -0800)]
Merge "Allow ContactsProvider to remove dulicates" into ics-mr1
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
OSDN Git Service
