OSDN Git Service
Daniel Sandler [Mon, 7 Feb 2011 21:14:52 +0000 (13:14 -0800)]
Merge "resolved conflicts for merge of
31796297 to master"
Daniel Sandler [Mon, 7 Feb 2011 21:12:16 +0000 (16:12 -0500)]
resolved conflicts for merge of
31796297 to master
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
Andreas Huber [Mon, 7 Feb 2011 21:10:01 +0000 (13:10 -0800)]
Merge "Display a single (still-)frame of video after seeking while paused."
Alon Albert [Mon, 7 Feb 2011 20:20:36 +0000 (12:20 -0800)]
Merge "Move handing of a "cancel" inside try-finally block"
Mike Lockwood [Mon, 7 Feb 2011 20:14:13 +0000 (12:14 -0800)]
Merge "MTP: Add support for querying all objects in GetObjectPropList"
Dianne Hackborn [Mon, 7 Feb 2011 20:11:12 +0000 (12:11 -0800)]
Merge "Fix COMPONENT_ENABLED_STATE check (copy from HC)"
Scott Main [Mon, 7 Feb 2011 19:41:07 +0000 (11:41 -0800)]
am
b1ef1c80: am
b65b2df6: cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
* commit '
b1ef1c80210deec80e0055fc33c8188561732895':
cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
Eric Laurent [Mon, 7 Feb 2011 19:40:51 +0000 (11:40 -0800)]
am
a37a81d7: am
e6955f8e: Merge "Issue
3371080: fix VolumePanel in mute state" into honeycomb
* commit '
a37a81d705bd9abaf1110fecd176a74d32ac2016':
Issue
3371080: fix VolumePanel in mute state
Jim Miller [Mon, 7 Feb 2011 19:40:38 +0000 (11:40 -0800)]
am
6b590c8f: am
0d47ac11: Merge "Fix
3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
* commit '
6b590c8fd36c20961e9f4ab36bfc03e82f5abf24':
Fix
3419077: Allow subclasses to change SeekBarPreference action buttons.
Jim Miller [Mon, 7 Feb 2011 19:40:21 +0000 (11:40 -0800)]
am
da983f73: am
4ce0cad1: Merge "Issue
3371080: fix volume update in mute state." into honeycomb
* commit '
da983f734c608fde57ea4f213d8640490a2f3a84':
Issue
3371080: fix volume update in mute state.
Scott Main [Mon, 7 Feb 2011 19:40:04 +0000 (11:40 -0800)]
am
be779cb7: am
4fe3e53e: update menu dev guide with more info about action bar
* commit '
be779cb745758bd22429f5e1ac2f5a99d5eb1b62':
update menu dev guide with more info about action bar
Dianne Hackborn [Mon, 7 Feb 2011 19:39:45 +0000 (11:39 -0800)]
am
94baff47: am
1b1962f3: Merge "Fix issue #
3420898: More wallpaper issues" into honeycomb
* commit '
94baff47975fb3ae1380333f23fc2de2dc65eb86':
Fix issue #
3420898: More wallpaper issues
Gil Dobjanschi [Mon, 7 Feb 2011 19:39:27 +0000 (11:39 -0800)]
am
99ec3e7f: am
7dd5763d: Merge "Bug fix:
3421011 ANR during delete video clip" into honeycomb
* commit '
99ec3e7f27ec7767d1f1a2c596ff2bddb7907a9c':
Bug fix:
3421011 ANR during delete video clip
Chet Haase [Mon, 7 Feb 2011 19:38:47 +0000 (11:38 -0800)]
am
38e8c353: am
59301777: Merge "Fix leak in reused display lists" into honeycomb
* commit '
38e8c35322e41708e5b1f2260d7d67ff525d8560':
Fix leak in reused display lists
Rebecca Schultz Zavin [Mon, 7 Feb 2011 19:38:34 +0000 (11:38 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Adam Powell [Mon, 7 Feb 2011 19:38:25 +0000 (11:38 -0800)]
am
86ce6866: am
c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
* commit '
86ce68668c700bd4090d6ef74df3483ce9fea957':
Asset updates for dialog frames and seek bar thumbs
Justin Ho [Mon, 7 Feb 2011 19:38:04 +0000 (11:38 -0800)]
am
6d1fbba6: am
40523b1b: Merge "Updating default wallpaper" into honeycomb
* commit '
6d1fbba68608dfd8d91d14d67bc34255a14ee4ac':
Updating default wallpaper
Justin Ho [Mon, 7 Feb 2011 19:37:48 +0000 (11:37 -0800)]
am
a9b9f9c8: am
b3e00457: Merge "Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons" into honeycomb
* commit '
a9b9f9c816b2dac559cd06a756587f92e6f2215c':
Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons
Nick Pelly [Mon, 7 Feb 2011 19:37:28 +0000 (11:37 -0800)]
am
7c95a2c2: am
062443f2: am
40684946: Merge "Fix docs type that broke build." into gingerbread
* commit '
7c95a2c2471e1ae2308f8a00927e08f321bf8059':
Fix docs type that broke build.
Romain Guy [Mon, 7 Feb 2011 19:37:12 +0000 (11:37 -0800)]
am
a9c369d0: am
87465f02: Merge "Fixes cache misses and extra allocations. Bug #
3421454" into honeycomb
* commit '
a9c369d0fbe2b995f456877b2368aac95f810558':
Fixes cache misses and extra allocations. Bug #
3421454
Jean-Baptiste Queru [Mon, 7 Feb 2011 19:36:55 +0000 (11:36 -0800)]
Amith Yamasani [Mon, 7 Feb 2011 19:36:32 +0000 (11:36 -0800)]
am
9589ac6c: am
823fbbba: Merge "Expanded volume panel with sliders and mute buttons." into honeycomb
* commit '
9589ac6c3f63a632e078adcc8ef742412af2014c':
Expanded volume panel with sliders and mute buttons.
Scott Main [Mon, 7 Feb 2011 19:36:04 +0000 (11:36 -0800)]
am
6a7ca8f8: am
51768f4b: am
779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread
* commit '
6a7ca8f807c842fe5f4ed14df25f4f919b6ab116':
cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard
Nick Pelly [Mon, 7 Feb 2011 19:35:47 +0000 (11:35 -0800)]
am
3bb7b0c2: am
5394ef06: am
630ac8df: Merge "NFC documentation overhaul." into gingerbread
* commit '
3bb7b0c2b3d448a60b64eba37c998d1f7c7424e2':
NFC documentation overhaul.
Mathias Agopian [Mon, 7 Feb 2011 19:35:20 +0000 (11:35 -0800)]
am
e5b6c284: am
33e9cb47: Merge "fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into honeycomb
* commit '
e5b6c284b6070a3ca9ac1d33b56baba95775ced5':
fix [
3421350] Killing a game that uses the accelerometer renders the device unable to sleep
Justin Ho [Mon, 7 Feb 2011 18:57:19 +0000 (10:57 -0800)]
am
0c3169cf: am
60a008ed: Updated volume dialog assets
* commit '
0c3169cf208b253b1f3f41ca82796a464eeec464':
Updated volume dialog assets
Jean-Baptiste Queru [Mon, 7 Feb 2011 18:48:25 +0000 (10:48 -0800)]
am
b6bf10e4: Merge
917d9ea1
* commit '
b6bf10e4bd2c17838a00091c3b8efb2f91ce3457':
Fix the Multi-page SMS sending error to several receipents
Justin Ho [Mon, 7 Feb 2011 18:48:07 +0000 (10:48 -0800)]
am
fc05bc3b: am
cc84ea17: Merge "Updated default wallpaper" into honeycomb
* commit '
fc05bc3b36c665a0da2661d57a2c5a68245e6a68':
Updated default wallpaper
Justin Ho [Mon, 7 Feb 2011 18:47:39 +0000 (10:47 -0800)]
am
bf13e077: am
e8d2b985: Merge "Scrubbing OGGs and updating all WAVs" into honeycomb
* commit '
bf13e0774e67f03433f5088a7d2c2fe6ee25e0c8':
Scrubbing OGGs and updating all WAVs
Justin Ho [Mon, 7 Feb 2011 18:47:17 +0000 (10:47 -0800)]
am
efba660d: am
97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb
* commit '
efba660d8efb8ed2f8c31c4aeea81b32016ad601':
Adding remaining volume dialog assets
Justin Ho [Mon, 7 Feb 2011 18:47:01 +0000 (10:47 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Justin Ho [Mon, 7 Feb 2011 18:46:47 +0000 (10:46 -0800)]
am
8bdfcaa0: am
9b95d352: Updated Talk notification icon Bug:
3362749
* commit '
8bdfcaa0c452dba14b1dc03d9a78728bb39e72a0':
Updated Talk notification icon Bug:
3362749
Andy Stadler [Mon, 7 Feb 2011 18:46:26 +0000 (10:46 -0800)]
Merge "Fix warnings"
David 'Digit' Turner [Sun, 6 Feb 2011 20:53:09 +0000 (12:53 -0800)]
Merge "WindowManagerService: Disable screen rotation animation under emulation."
Lorenzo Colitti [Sat, 5 Feb 2011 01:41:11 +0000 (17:41 -0800)]
Merge "Add a protocol property to the APNs and use it."
Wink Saville [Fri, 4 Feb 2011 23:04:38 +0000 (15:04 -0800)]
Merge "Fix SETUP_DATA_CALL handling."
Glenn Kasten [Fri, 4 Feb 2011 22:00:17 +0000 (14:00 -0800)]
Merge "Bug
3366668 Use BinderService template"
Andreas Huber [Fri, 4 Feb 2011 18:21:15 +0000 (10:21 -0800)]
Merge "Ignore format change message in sf2 instead of asserting"
Andreas Huber [Fri, 4 Feb 2011 18:21:07 +0000 (10:21 -0800)]
Merge "Improvements/fixes to ACodec."
Robert Greenwalt [Fri, 4 Feb 2011 18:16:22 +0000 (10:16 -0800)]
Merge "Place the DHCP server address in the "next server IP address" field of the bootp header. A certain Apple client likes this, and it is more consistent with other DHCP servers."
Daniel Sandler [Fri, 4 Feb 2011 04:51:00 +0000 (20:51 -0800)]
am
4ad2547f: Merge "Ongoing notification for GPS use." into honeycomb
* commit '
4ad2547fe08bab430d7d9f9cc4b789410856c9c3':
Ongoing notification for GPS use.
Daniel Sandler [Fri, 4 Feb 2011 04:49:10 +0000 (20:49 -0800)]
Merge "Ongoing notification for GPS use." into honeycomb
Scott Main [Fri, 4 Feb 2011 03:40:40 +0000 (19:40 -0800)]
am
b65b2df6: cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
* commit '
b65b2df6e421d0fc8516e933f52763ff172760f3':
cherrypick Change-Id: Ie0c6540a3a6d86780718e2918b8dffcda37d925c docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:
Eric Laurent [Fri, 4 Feb 2011 03:38:27 +0000 (19:38 -0800)]
am
e6955f8e: Merge "Issue
3371080: fix VolumePanel in mute state" into honeycomb
* commit '
e6955f8e38dfe7c0d748c3b55bbcfc5640c968c5':
Issue
3371080: fix VolumePanel in mute state
Eric Laurent [Fri, 4 Feb 2011 03:35:57 +0000 (19:35 -0800)]
Merge "Issue
3371080: fix VolumePanel in mute state" into honeycomb
Glenn Kasten [Fri, 4 Feb 2011 02:44:32 +0000 (18:44 -0800)]
Merge "Bug
3366885 Remove LVMX switch"
Jim Miller [Fri, 4 Feb 2011 02:42:08 +0000 (18:42 -0800)]
am
0d47ac11: Merge "Fix
3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
* commit '
0d47ac11764b89431777c3a84efd5fa9c17130dc':
Fix
3419077: Allow subclasses to change SeekBarPreference action buttons.
Jim Miller [Fri, 4 Feb 2011 02:39:39 +0000 (18:39 -0800)]
Merge "Fix
3419077: Allow subclasses to change SeekBarPreference action buttons." into honeycomb
Jim Miller [Fri, 4 Feb 2011 02:32:32 +0000 (18:32 -0800)]
am
4ce0cad1: Merge "Issue
3371080: fix volume update in mute state." into honeycomb
* commit '
4ce0cad1b31016970f65bae0151dccb2234ee202':
Issue
3371080: fix volume update in mute state.
Jim Miller [Fri, 4 Feb 2011 02:29:36 +0000 (18:29 -0800)]
Merge "Issue
3371080: fix volume update in mute state." into honeycomb
Jean-Baptiste Queru [Fri, 4 Feb 2011 02:09:36 +0000 (18:09 -0800)]
Jean-Baptiste Queru [Fri, 4 Feb 2011 02:09:26 +0000 (18:09 -0800)]
am
5086c457: am
baaaca1c: Merge
ee4c17ee from gingerbread
* commit '
5086c45718a8344fb36adf5b15e98953612cac37':
Fix delivery report error with PENDING status in SMS
Justin Ho [Fri, 4 Feb 2011 02:09:00 +0000 (18:09 -0800)]
am
b7fa0b65: am
ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb
* commit '
b7fa0b65d789464f67b00d5975a9bc26460ce63c':
Revert "Sounds cleanup"
Vasu Nori [Fri, 4 Feb 2011 02:08:44 +0000 (18:08 -0800)]
am
9ec496b4: am
e1cbd0a8: Revert "Merge "bug:
3414192 new API to designate a download to be OTA update" into honeycomb"
* commit '
9ec496b484305defa6cbb691b85836ace8b73a02':
Revert "Merge "bug:
3414192 new API to designate a download to be OTA update" into honeycomb"
Michael Jurka [Fri, 4 Feb 2011 02:08:17 +0000 (18:08 -0800)]
am
d51e0820: am
8275c608: Merge "adding fast setters for translationx/y" into honeycomb
* commit '
d51e0820b3b7a71f2b3e0447bdf05188588c6003':
adding fast setters for translationx/y
Romain Guy [Fri, 4 Feb 2011 02:08:03 +0000 (18:08 -0800)]
am
cb2c84fd: am
3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #
3420565" into honeycomb
* commit '
cb2c84fd81a0891071e8ed0237927ad785751850':
Refresh display lists when turning off layers rendering. Bug #
3420565
Xavier Ducrohet [Fri, 4 Feb 2011 02:07:36 +0000 (18:07 -0800)]
am
1ea9930e: am
5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb
* commit '
1ea9930e74a3b10186b7691060b6e6cf09f73b07':
LayoutLib: Fix some rendering issues
Evan Millar [Fri, 4 Feb 2011 02:07:29 +0000 (18:07 -0800)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Justin Ho [Fri, 4 Feb 2011 02:07:03 +0000 (18:07 -0800)]
am
da75a283: am
205bdd4f: Merge "Sounds cleanup" into honeycomb
* commit '
da75a28304a026634e6583735e525c13a2040239':
Sounds cleanup
satok [Fri, 4 Feb 2011 02:07:03 +0000 (18:07 -0800)]
Merge "Register ENABLED_INPUT_METHODS to SettingsObserver"
Scott Main [Fri, 4 Feb 2011 02:06:55 +0000 (18:06 -0800)]
am
4fe3e53e: update menu dev guide with more info about action bar
* commit '
4fe3e53e854b0056b774bfe25e3d1a2d4841aa32':
update menu dev guide with more info about action bar
Dianne Hackborn [Fri, 4 Feb 2011 01:50:51 +0000 (17:50 -0800)]
am
1b1962f3: Merge "Fix issue #
3420898: More wallpaper issues" into honeycomb
* commit '
1b1962f38304d2cbf12ac008791d93d3f1bdf0a6':
Fix issue #
3420898: More wallpaper issues
Dianne Hackborn [Fri, 4 Feb 2011 01:48:51 +0000 (17:48 -0800)]
Merge "Fix issue #
3420898: More wallpaper issues" into honeycomb
Gil Dobjanschi [Fri, 4 Feb 2011 01:45:33 +0000 (17:45 -0800)]
am
7dd5763d: Merge "Bug fix:
3421011 ANR during delete video clip" into honeycomb
* commit '
7dd5763d0e6f96ff2a7bb48b816664b1ec7d645d':
Bug fix:
3421011 ANR during delete video clip
Gil Dobjanschi [Fri, 4 Feb 2011 01:43:09 +0000 (17:43 -0800)]
Merge "Bug fix:
3421011 ANR during delete video clip" into honeycomb
Jaikumar Ganesh [Fri, 4 Feb 2011 01:27:10 +0000 (17:27 -0800)]
Merge "Wait till SDP records are registered before sending intent."
Daniel Sandler [Fri, 4 Feb 2011 01:19:16 +0000 (17:19 -0800)]
am
63944f6c: am
2243cca4: Merge "Time to take down the Christmas lights." into honeycomb
* commit '
63944f6c38090e263d824d9c4a074d2baf13a21c':
Time to take down the Christmas lights.
Joe Malin [Fri, 4 Feb 2011 01:19:05 +0000 (17:19 -0800)]
am
64ee4ed4: am
70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb
* commit '
64ee4ed48de701ffa0096e8fb715a604821d6b5e':
DOC CHANGE: Fix bugs in Installing SDK topic
Eric Laurent [Fri, 4 Feb 2011 01:18:46 +0000 (17:18 -0800)]
Justin Ho [Fri, 4 Feb 2011 01:18:36 +0000 (17:18 -0800)]
am
7fbdc7f6: am
8138fc1f: Merge "Adding Iridium as a ringtone" into honeycomb
* commit '
7fbdc7f6ecfff38693e4ca337984b591a8560574':
Adding Iridium as a ringtone
Daniel Sandler [Fri, 4 Feb 2011 01:18:23 +0000 (17:18 -0800)]
am
62362af8: am
81034187: Merge "Move the low battery sound to the notification stream." into honeycomb
* commit '
62362af8f93a44147e27a43c56d3c8da22ae1864':
Move the low battery sound to the notification stream.
Dheeraj Sharma [Fri, 4 Feb 2011 01:18:13 +0000 (17:18 -0800)]
am
d13f987f: am
36b685ff: Merge "Fix for issue :
3419353 Crash during transition generation" into honeycomb
* commit '
d13f987f73df03b06c70c631452f6cafbdc254e1':
Fix for issue :
3419353 Crash during transition generation
Cary Clark [Fri, 4 Feb 2011 01:17:45 +0000 (17:17 -0800)]
am
859563eb: am
aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
* commit '
859563ebf7edbb6d556ef10bac7315fdc564e73a':
stop GL drawing thread before killing WebCore
Justin Ho [Fri, 4 Feb 2011 01:17:35 +0000 (17:17 -0800)]
am
7d75cd65: am
b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
* commit '
7d75cd65fa08e9457f6dacb5eb89664a09789dd9':
Changing Honeycomb default wallpaper
Romain Guy [Fri, 4 Feb 2011 01:17:21 +0000 (17:17 -0800)]
am
20bf23e5: am
ac14db72: Merge "Fast transform properties setters. Bug #
3413510" into honeycomb
* commit '
20bf23e5e4172f5f80ce6c4cc16168355b107f0d':
Fast transform properties setters. Bug #
3413510
Daniel Sandler [Fri, 4 Feb 2011 01:16:54 +0000 (17:16 -0800)]
am
a2e82d4c: am
6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
* commit '
a2e82d4c69bc25eb9f262be0efb4bd38695c4f86':
Implement priority ordering in notifications.
Gil Dobjanschi [Fri, 4 Feb 2011 01:16:43 +0000 (17:16 -0800)]
am
3f9a851e: am
ed2c5133: Merge "Bug fix:
3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit '
3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
Bug fix:
3419287 Deleted images and video clips invalidate the entire project
Chet Haase [Fri, 4 Feb 2011 01:16:32 +0000 (17:16 -0800)]
am
59301777: Merge "Fix leak in reused display lists" into honeycomb
* commit '
59301777215d2e137994107d20ba40d72c7cd349':
Fix leak in reused display lists
Joe Onorato [Fri, 4 Feb 2011 01:16:31 +0000 (17:16 -0800)]
am
020c021c: am
e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
* commit '
020c021c62f804ed08d89a3a38457a002184158e':
Add a bluetooth icon and data direction to the status bar.
Romain Guy [Fri, 4 Feb 2011 01:16:19 +0000 (17:16 -0800)]
am
109da7df: am
5bfd1aff: Merge "Allocate layers from the layers pool. Bug #
3413433" into honeycomb
* commit '
109da7dfd4c0766274b17467880ee673c731735c':
Allocate layers from the layers pool. Bug #
3413433
Justin Ho [Fri, 4 Feb 2011 01:15:33 +0000 (17:15 -0800)]
am
a29acdfb: am
1cee14f1: Merge "System bar tweaks" into honeycomb
* commit '
a29acdfb8a3c9812718ead057f77ef5dbd508682':
System bar tweaks
Justin Ho [Fri, 4 Feb 2011 01:15:21 +0000 (17:15 -0800)]
am
8e2c67ea: am
be36f9a3: Merge "Adding new volume control dialog icons" into honeycomb
* commit '
8e2c67ea26d38677802f3029472aa2393f47173d':
Adding new volume control dialog icons
Dianne Hackborn [Fri, 4 Feb 2011 01:15:04 +0000 (17:15 -0800)]
am
dd954212: am
a5861743: Merge "Fix issue #
3418265: Rotation animation on wallpaper is broken" into honeycomb
* commit '
dd95421291f590ec0b1d8e79b73264516e1da027':
Fix issue #
3418265: Rotation animation on wallpaper is broken
Jean-Michel Trivi [Fri, 4 Feb 2011 01:14:44 +0000 (17:14 -0800)]
am
d1488c58: am
17f88656: Fix audible selection sound is not played
* commit '
d1488c588d796ee0d44235b11510327144be977a':
Fix audible selection sound is not played
Chet Haase [Fri, 4 Feb 2011 01:13:31 +0000 (17:13 -0800)]
Merge "Fix leak in reused display lists" into honeycomb
Adam Powell [Fri, 4 Feb 2011 01:00:10 +0000 (17:00 -0800)]
am
c1be7ac9: Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
* commit '
c1be7ac9121ac8b7b7cfd2205ff928fb0d11fef8':
Asset updates for dialog frames and seek bar thumbs
Scott Main [Fri, 4 Feb 2011 00:57:36 +0000 (16:57 -0800)]
Merge "docs: Rewrite of App Fundamentals.. Part 3 This introduces two new docs:"
Adam Powell [Fri, 4 Feb 2011 00:57:21 +0000 (16:57 -0800)]
Merge "Asset updates for dialog frames and seek bar thumbs" into honeycomb
Justin Ho [Fri, 4 Feb 2011 00:55:07 +0000 (16:55 -0800)]
am
40523b1b: Merge "Updating default wallpaper" into honeycomb
* commit '
40523b1b27826ee58a101b0450eff74ab14cb0b5':
Updating default wallpaper
Justin Ho [Fri, 4 Feb 2011 00:55:03 +0000 (16:55 -0800)]
am
b3e00457: Merge "Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons" into honeycomb
* commit '
b3e0045794b135674bedcbfc47a23866fde91c8b':
Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons
Justin Ho [Fri, 4 Feb 2011 00:53:40 +0000 (16:53 -0800)]
Merge "Updating default wallpaper" into honeycomb
Justin Ho [Fri, 4 Feb 2011 00:53:23 +0000 (16:53 -0800)]
Merge "Updated notification area layout Bumping clock up 1px Swapping in new Bluetooth icons" into honeycomb
Nick Pelly [Fri, 4 Feb 2011 00:35:12 +0000 (16:35 -0800)]
am
062443f2: am
40684946: Merge "Fix docs type that broke build." into gingerbread
* commit '
062443f2956bb85ef84485a62e9b0496fded68ae':
Fix docs type that broke build.
Romain Guy [Fri, 4 Feb 2011 00:34:06 +0000 (16:34 -0800)]
am
87465f02: Merge "Fixes cache misses and extra allocations. Bug #
3421454" into honeycomb
* commit '
87465f02e4113542bb203232fed0c0f1f67f9a17':
Fixes cache misses and extra allocations. Bug #
3421454
Nick Pelly [Fri, 4 Feb 2011 00:32:29 +0000 (16:32 -0800)]
am
40684946: Merge "Fix docs type that broke build." into gingerbread
* commit '
40684946cb00080c1c7424885f49a809816dd26e':
Fix docs type that broke build.
Romain Guy [Fri, 4 Feb 2011 00:31:41 +0000 (16:31 -0800)]
Merge "Fixes cache misses and extra allocations. Bug #
3421454" into honeycomb
Nick Pelly [Fri, 4 Feb 2011 00:27:51 +0000 (16:27 -0800)]
Merge "Fix docs type that broke build." into gingerbread
Jean-Baptiste Queru [Fri, 4 Feb 2011 00:24:19 +0000 (16:24 -0800)]
Jean-Baptiste Queru [Fri, 4 Feb 2011 00:21:47 +0000 (16:21 -0800)]
Andreas Huber [Fri, 4 Feb 2011 00:19:59 +0000 (16:19 -0800)]
Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)"
OSDN Git Service
