1. e32af36 am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" by Xavier Ducrohet · 14 years ago
  2. 44f57c0 am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" by Xavier Ducrohet · 14 years ago
  3. 060c1a8 Merge "DO NOT MERGE. may fix build on some version of gcc" by Xavier Ducrohet · 14 years ago
  4. aa59908 DO NOT MERGE. may fix build on some version of gcc by Mathias Agopian · 14 years ago
  5. 015be54 am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  6. 461653a am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  7. f0a8de9 am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  8. 6f4d39f am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  9. cf95800 Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  10. ac95550 Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  11. 852f77c am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." by Xavier Ducrohet · 14 years ago
  12. e420976 am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." by Xavier Ducrohet · 14 years ago
  13. fe7fbed Merge "Layoutlib_create flag -p: don't change all accesses to public." by Xavier Ducrohet · 14 years ago
  14. fed1e90 am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  15. 2cc4e53 am 3cf03987: Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  16. c0e7a06 Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  17. e164ef4 am 594745ab: am b9f87f19: Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  18. a446055 am b9f87f19: Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  19. 813dac2 Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  20. 656ddbe am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  21. 029c315 am 9bac0a9f: Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  22. dd66568 Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  23. 2cb8dfb am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  24. 97aaf7c am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  25. 0d4b073 Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  26. 5c0019b am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  27. 99f6033 am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  28. 6e06869 Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  29. a3563e8 am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  30. 0092886 am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  31. dae75dd am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  32. e74c354 am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  33. 166845b Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  34. c6c26cd Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  35. 60f8195 am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  36. 61d3cf3 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  37. 0d0cbd3 Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  38. 4161a01 am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  39. 190218d am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  40. 9781293 am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  41. 1a2e048 am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  42. 07f2ce4 am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  43. b54c227 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  44. 2be5cc2 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  45. c4bb455 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  46. fde808c Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  47. e51e21c Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  48. 1ae41e2 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  49. 605aac1 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  50. 8c5dd00 am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  51. 4b1d4a7 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  52. 9569289 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  53. 4fa5dc5 am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread by Nick Pelly · 14 years ago
  54. 99a444e am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  55. 04b3638 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  56. 95c15ba Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  57. 3b7791c resolved conflicts for merge of 7816eded to gingerbread-plus-aosp by David 'Digit' Turner · 14 years ago
  58. 407c94a Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread by Nick Pelly · 14 years ago
  59. c681878 merge intel x86 patches into gingerbread branch by David 'Digit' Turner · 14 years ago
  60. d4c2668 Fix missing NL by Bruce Beare · 15 years ago
  61. 7a49c91 am 2b62c4fb: am 38bb0123: Merge "Added methods to support dns cache per interface" by Robert Greenwalt · 14 years ago
  62. 25fbdf5 am 38bb0123: Merge "Added methods to support dns cache per interface" by Robert Greenwalt · 14 years ago
  63. e7438cc Merge "Added methods to support dns cache per interface" by Robert Greenwalt · 14 years ago
  64. 5040be6 am 9f2cbf14: am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." by Conley Owens · 14 years ago
  65. fdf196c am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." by Conley Owens · 14 years ago
  66. efa5bc7 Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." by Conley Owens · 14 years ago
  67. bbfaea5 am 4d825e1f: Merge "Bring in more layout lib changes from hc-mr1." into gingerbread by Xavier Ducrohet · 14 years ago
  68. 8d5e867 am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread by Xavier Ducrohet · 14 years ago
  69. 691580c am 9918ffb0: Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread by Xavier Ducrohet · 14 years ago
  70. 73b607f am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread by Xavier Ducrohet · 14 years ago
  71. 340f5a7 Merge "Bring in more layout lib changes from hc-mr1." into gingerbread by Xavier Ducrohet · 14 years ago
  72. a77c339 Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread by Xavier Ducrohet · 14 years ago
  73. 75d0ba1 Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread by Xavier Ducrohet · 14 years ago
  74. 10779f5 Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread by Xavier Ducrohet · 14 years ago
  75. 9e95be6 am 2f9ad8b4: Add intent actions for new firmware events. by mike wakerly · 14 years ago
  76. aac9682 am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." by Jean-Baptiste Queru · 14 years ago
  77. cf949e6 am f458d5fd: Merge "Tweak for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  78. 8349a22 Merge "Add WEBP to the list of Image formats that support Compression." by Jean-Baptiste Queru · 14 years ago
  79. 0891d8c Merge "Tweak for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  80. a614150 Tweak for forward-compatibility by Jean-Baptiste Queru · 14 years ago
  81. 68238ef am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." by Raphael Moll · 14 years ago
  82. ad81c78 Merge "Laoutlib_creator: keep original of delegate methods." by Raphael Moll · 14 years ago
  83. 610b7f2 am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread by Jaikumar Ganesh · 14 years ago
  84. fa4c10e Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread by Jaikumar Ganesh · 14 years ago
  85. 64c4f89 am 17523abb: NFC Adapter Extras API update. by Nick Pelly · 14 years ago
  86. 1894fc2 am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" by Conley Owens · 14 years ago
  87. a77ed0e Merge "Check if we are in daylight time when calculating timezone" by Conley Owens · 14 years ago
  88. 75e3e49 am e3b05d09: Merge "Tweaks for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  89. 101d6fc Merge "Tweaks for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  90. 3f3f5af Tweaks for forward-compatibility by Jean-Baptiste Queru · 14 years ago
  91. 66ff46b DO NOT MERGE. may fix build on some version of gcc by Mathias Agopian · 14 years ago
  92. dc1a5d7 am d76baeb4: Merge "Import revised Croatian translations." into gingerbread by Maarten Hooft · 14 years ago
  93. fad4d64 Merge "Import revised Croatian translations." into gingerbread by Maarten Hooft · 14 years ago
  94. 9dfdb87 am df1734e3: Fix lease duration handling by Irfan Sheriff · 14 years ago
  95. 35cc0fc am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 14 years ago
  96. dd729fc resolved conflicts for merge of d027329c to gingerbread-plus-aosp by Marco Nelissen · 14 years ago
  97. 76feee7 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 14 years ago
  98. 48014c7 am 8688d470: Moving flag to a member field instead of a stack variable. by Dan Morrill · 14 years ago
  99. 5e76bf9 am a1a107b8: Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread by Dan Morrill · 14 years ago
  100. 907dfec Merge "Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it." into gingerbread by Dan Morrill · 14 years ago