Commit Graph

29849 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
09a49faead am 375afcd5: am 4b8ad9ef: Merge from gingerbread
* commit '375afcd5d69f47c85960270bf51b83a2b768d446':
2011-02-03 13:32:08 -08:00
Jean-Baptiste Queru
70ca70dee2 am 4b8ad9ef: Merge from gingerbread
* commit '4b8ad9effd95508e9966b8a3a355f0a948558ae2':
  Fix delivery report error with PENDING status in SMS
2011-02-03 13:28:51 -08:00
Jean-Baptiste Queru
9a0255c3c4 Merge from gingerbread
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
2011-02-03 13:17:49 -08:00
Robert Greenwalt
6bfb0a3830 Merge "Bind addr and prefixLength together in LinkAddress" 2011-02-03 13:17:48 -08:00
Jean-Baptiste Queru
d5064c6252 am baaaca1c: Merge ee4c17ee from gingerbread
* commit 'baaaca1c6164eff17488a178859295a1d5be9171':
  Fix delivery report error with PENDING status in SMS
2011-02-03 13:12:35 -08:00
Jean-Baptiste Queru
3c988fc39c Merge ee4c17ee from gingerbread
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
60bcbd0eae Merge from open-source gingerbread
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
2011-02-03 12:41:51 -08:00
Justin Ho
7fb69db5e0 am ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb
* commit 'ef36255f876aa1a61dcf5e879f4380887dda3854':
  Revert "Sounds cleanup"
2011-02-03 12:38:26 -08:00
Justin Ho
c3d39921a2 Merge "Revert "Sounds cleanup"" into honeycomb 2011-02-03 12:35:51 -08:00
Vasu Nori
1ebcb187ee am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
* commit 'e1cbd0a85f09a54f8bf28545ac67455b7dcd2532':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
2011-02-03 12:24:59 -08:00
Jean-Baptiste Queru
05e90f057a Merge "Fix delivery report error with PENDING status in SMS" into gingerbread 2011-02-03 12:17:47 -08:00
Michael Jurka
4131afc36b am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb
* commit '8275c6087897e8fd614681d1cd12db62e6b9fcd5':
  adding fast setters for translationx/y
2011-02-03 12:02:37 -08:00
Michael Jurka
5c80436c54 Merge "adding fast setters for translationx/y" into honeycomb 2011-02-03 12:00:37 -08:00
Romain Guy
8c24081227 am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb
* commit '3b66e43e8c5671c646ccc6d52b0f2dec13898c91':
  Refresh display lists when turning off layers rendering. Bug #3420565
2011-02-03 11:46:47 -08:00
Shimeng (Simon) Wang
b2d4c42a17 Merge "Use more accurate height/width ratio." 2011-02-03 11:44:06 -08:00
Romain Guy
21d3caa8ed Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 2011-02-03 11:43:17 -08:00
Xavier Ducrohet
635a70dee4 am 5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb
* commit '5e76e0aea28042287553ffa21826f59f601a3d2b':
  LayoutLib: Fix some rendering issues
2011-02-03 11:23:39 -08:00
Xavier Ducrohet
1a05fcd202 Merge "LayoutLib: Fix some rendering issues" into honeycomb 2011-02-03 11:21:37 -08:00
Marco Nelissen
b0c27f7aa9 Merge "Add a convenience method for getting the media provider version." 2011-02-03 11:06:07 -08:00
Kenny Root
8c60f04c94 Merge "Remove defunct secure FS work" 2011-02-03 11:04:28 -08:00
Justin Ho
c5018654e5 am 205bdd4f: Merge "Sounds cleanup" into honeycomb
* commit '205bdd4f8951d4af9cfaeb8fb4ad9d0f1cad1afc':
  Sounds cleanup
2011-02-03 10:49:43 -08:00
Justin Ho
2fc9aa13e0 Merge "Sounds cleanup" into honeycomb 2011-02-03 10:47:22 -08:00
Daniel Sandler
5e200251c1 am 2243cca4: Merge "Time to take down the Christmas lights." into honeycomb
* commit '2243cca40c5f74cf89fe9bccce6e35af1acedb0c':
  Time to take down the Christmas lights.
2011-02-03 10:36:02 -08:00
Daniel Sandler
60c921294a Merge "Time to take down the Christmas lights." into honeycomb 2011-02-03 10:33:51 -08:00
Joe Malin
2236131dc6 am 70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb
* commit '70ff567a2722789ac5196a92e615dd39c29b5964':
  DOC CHANGE: Fix bugs in Installing SDK topic
2011-02-03 10:30:38 -08:00
Eric Laurent
e4466b0306 am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
  Fix issue 3371080
2011-02-03 10:28:24 -08:00
Joe Malin
ee32c0c755 Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb 2011-02-03 10:27:22 -08:00
Eric Laurent
6bfb7ed0b1 Merge "Fix issue 3371080" into honeycomb 2011-02-03 10:26:05 -08:00
Justin Ho
d4aa293504 am 8138fc1f: Merge "Adding Iridium as a ringtone" into honeycomb
* commit '8138fc1ff3c541ee040b55f07d06b2e2974247bf':
  Adding Iridium as a ringtone
2011-02-03 10:23:51 -08:00
Justin Ho
d75437c7af Merge "Adding Iridium as a ringtone" into honeycomb 2011-02-03 10:21:17 -08:00
Mike Lockwood
ee1514b206 Merge changes I80558c62,I6587f580
* changes:
  UsbService: Blacklist HID boot subclass devices (keyboards and mice)
  UsbService: Add support for blacklisting certain USB busses
2011-02-03 09:51:06 -08:00
Daniel Sandler
3ac46785c2 am 81034187: Merge "Move the low battery sound to the notification stream." into honeycomb
* commit '81034187a34c7c6432e62d2dc2332e987ce4f5db':
  Move the low battery sound to the notification stream.
2011-02-03 09:50:27 -08:00
Daniel Sandler
69da712510 Merge "Move the low battery sound to the notification stream." into honeycomb 2011-02-03 09:47:45 -08:00
Dheeraj Sharma
7421b648fe am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
* commit '36b685ffb0e3c1848bc8085757da3e673d19028a':
  Fix for issue :  3419353 Crash during transition generation
2011-02-03 09:38:43 -08:00
Dheeraj Sharma
1414d12989 Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb 2011-02-03 09:36:02 -08:00
Cary Clark
e30b192aed am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb
* commit 'aa7dc92838f4e3d423b2a738f54de9b83f83794b':
  stop GL drawing thread before killing WebCore
2011-02-03 08:52:21 -08:00
Cary Clark
00356fe99f Merge "stop GL drawing thread before killing WebCore" into honeycomb 2011-02-03 08:48:24 -08:00
Justin Ho
9a6115c11f am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb
* commit 'b732e6d20571e9098b02f4d49f0e4359c232eaa0':
  Changing Honeycomb default wallpaper
2011-02-03 07:31:28 -08:00
Justin Ho
05aa7cc609 Merge "Changing Honeycomb default wallpaper" into honeycomb 2011-02-03 07:25:18 -08:00
Romain Guy
7938d578f5 am ac14db72: Merge "Fast transform properties setters. Bug #3413510" into honeycomb
* commit 'ac14db72ca55110326f4ceb9ac34fddd360036f4':
  Fast transform properties setters. Bug #3413510
2011-02-03 01:37:29 -08:00
Romain Guy
2cd40b193a Merge "Fast transform properties setters. Bug #3413510" into honeycomb 2011-02-03 01:11:39 -08:00
Daniel Sandler
50c2a85ac0 am 6f922cbe: Merge "Implement priority ordering in notifications." into honeycomb
* commit '6f922cbe823c19234bc15eea9ac709f399e9a63c':
  Implement priority ordering in notifications.
2011-02-02 22:41:25 -08:00
Daniel Sandler
7b1a58eb04 Merge "Implement priority ordering in notifications." into honeycomb 2011-02-02 22:39:25 -08:00
Gil Dobjanschi
68fa62fb14 am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit 'ed2c513337ae7581ef73b88424da91ef2d862a78':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project
2011-02-02 22:06:33 -08:00
Gil Dobjanschi
1f6e0735f1 Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb 2011-02-02 22:04:38 -08:00
Joe Onorato
766bddb925 am e9dea7b7: Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb
* commit 'e9dea7b735fb0fdb1956d96a6e78b1c5cd666316':
  Add a bluetooth icon and data direction to the status bar.
2011-02-02 21:24:47 -08:00
Joe Onorato
6bbebe1404 Merge "Add a bluetooth icon and data direction to the status bar." into honeycomb 2011-02-02 21:22:49 -08:00
Romain Guy
9d2957c786 am 5bfd1aff: Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb
* commit '5bfd1afffe361958682bcb899b763ce35ec00c3a':
  Allocate layers from the layers pool. Bug #3413433
2011-02-02 21:07:17 -08:00
Romain Guy
b1c3ce3c1f Merge "Allocate layers from the layers pool. Bug #3413433" into honeycomb 2011-02-02 21:05:35 -08:00
Justin Ho
5992210abd am 1cee14f1: Merge "System bar tweaks" into honeycomb
* commit '1cee14f154aadabcd9990bd73a197fbd744660ad':
  System bar tweaks
2011-02-02 18:50:02 -08:00