1. fe70827 am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" by Gloria Wang · 14 years ago
  2. 0e3e14f Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" by Gloria Wang · 14 years ago
  3. 1966e6f am 6b3a0123: Merge "Insert a break wraparound." by Xavier Ducrohet · 14 years ago
  4. a62b247 Merge "Insert a break wraparound." by Xavier Ducrohet · 14 years ago
  5. c2c411d am 8f5dd9ad: Merge "GPS Provider Service changes" by Mike Lockwood · 14 years ago
  6. fca789b Merge "GPS Provider Service changes" by Mike Lockwood · 14 years ago
  7. 8fdbdf4 am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" by Jean-Baptiste Queru · 14 years ago
  8. 8fdba3d Merge "Fix a compiling error when trying to use setBufferCount" by Jean-Baptiste Queru · 14 years ago
  9. 697bce0 Fix a compiling error when trying to use setBufferCount by Teng-Hui Zhu · 14 years ago
  10. 6662266 am f87743e7: Merge "Prevent NullPointerException cases while using SipService." by Conley Owens · 14 years ago
  11. b1d918b Merge "Prevent NullPointerException cases while using SipService." by Conley Owens · 14 years ago
  12. 46b0fc9 am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." by Jean-Baptiste Queru · 14 years ago
  13. ae18259 Merge "Stagefright: Return error if codec takes too long to return a buffer." by Jean-Baptiste Queru · 14 years ago
  14. adbba1f am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." by Derek Sollenberger · 14 years ago
  15. 0ed90b7 Merge "Adding an optional param to the SurfaceTexture constructor." by Derek Sollenberger · 14 years ago
  16. 77c988c Adding an optional param to the SurfaceTexture constructor. by Derek Sollenberger · 14 years ago
  17. 7779a44 am bd1dee94: Merge "gps: Adding ip address for AGps" by Mike Lockwood · 14 years ago
  18. 7c95ffb Merge "gps: Adding ip address for AGps" by Mike Lockwood · 14 years ago
  19. 956ddf56 am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" by Mike Lockwood · 14 years ago
  20. a9b8a06 Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" by Mike Lockwood · 14 years ago
  21. 7fa726e am 20339b24: Merge "Remove Debug Code" by Xavier Ducrohet · 14 years ago
  22. eff4cc7 Merge "Remove Debug Code" by Xavier Ducrohet · 14 years ago
  23. 44f57c0 am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" by Xavier Ducrohet · 14 years ago
  24. 060c1a8 Merge "DO NOT MERGE. may fix build on some version of gcc" by Xavier Ducrohet · 14 years ago
  25. aa59908 DO NOT MERGE. may fix build on some version of gcc by Mathias Agopian · 14 years ago
  26. 461653a am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  27. 6f4d39f am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  28. cf95800 Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  29. ac95550 Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  30. e420976 am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." by Xavier Ducrohet · 14 years ago
  31. fe7fbed Merge "Layoutlib_create flag -p: don't change all accesses to public." by Xavier Ducrohet · 14 years ago
  32. 2cc4e53 am 3cf03987: Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  33. c0e7a06 Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  34. a446055 am b9f87f19: Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  35. 813dac2 Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  36. 029c315 am 9bac0a9f: Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  37. dd66568 Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  38. 97aaf7c am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  39. 0d4b073 Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  40. 99f6033 am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  41. 6e06869 Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  42. dae75dd am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  43. e74c354 am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  44. 166845b Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  45. c6c26cd Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  46. 61d3cf3 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  47. 0d0cbd3 Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  48. 07f2ce4 am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  49. b54c227 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  50. 2be5cc2 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  51. c4bb455 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  52. fde808c Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  53. e51e21c Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  54. 1ae41e2 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  55. 605aac1 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  56. 4b1d4a7 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  57. 9569289 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  58. 04b3638 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  59. 95c15ba Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  60. 25fbdf5 am 38bb0123: Merge "Added methods to support dns cache per interface" by Robert Greenwalt · 14 years ago
  61. e7438cc Merge "Added methods to support dns cache per interface" by Robert Greenwalt · 14 years ago
  62. fdf196c am e06749e1: Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." by Conley Owens · 14 years ago
  63. efa5bc7 Merge "Add FLAG_AUTO_CANCEL flag for multiple supl notifications." by Conley Owens · 14 years ago
  64. aac9682 am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." by Jean-Baptiste Queru · 14 years ago
  65. cf949e6 am f458d5fd: Merge "Tweak for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  66. 8349a22 Merge "Add WEBP to the list of Image formats that support Compression." by Jean-Baptiste Queru · 14 years ago
  67. 0891d8c Merge "Tweak for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  68. a614150 Tweak for forward-compatibility by Jean-Baptiste Queru · 14 years ago
  69. 68238ef am e2b41b0d: Merge "Laoutlib_creator: keep original of delegate methods." by Raphael Moll · 14 years ago
  70. ad81c78 Merge "Laoutlib_creator: keep original of delegate methods." by Raphael Moll · 14 years ago
  71. 610b7f2 am b38fa2a0: Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread by Jaikumar Ganesh · 14 years ago
  72. fa4c10e Merge "DO NOT MERGE Incoming Bluetooth Connection requests - dialog." into gingerbread by Jaikumar Ganesh · 14 years ago
  73. 64c4f89 am 17523abb: NFC Adapter Extras API update. by Nick Pelly · 14 years ago
  74. 1894fc2 am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone" by Conley Owens · 14 years ago
  75. a77ed0e Merge "Check if we are in daylight time when calculating timezone" by Conley Owens · 14 years ago
  76. 75e3e49 am e3b05d09: Merge "Tweaks for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  77. 101d6fc Merge "Tweaks for forward-compatibility" by Jean-Baptiste Queru · 14 years ago
  78. 3f3f5af Tweaks for forward-compatibility by Jean-Baptiste Queru · 14 years ago
  79. dc1a5d7 am d76baeb4: Merge "Import revised Croatian translations." into gingerbread by Maarten Hooft · 14 years ago
  80. fad4d64 Merge "Import revised Croatian translations." into gingerbread by Maarten Hooft · 14 years ago
  81. 9dfdb87 am df1734e3: Fix lease duration handling by Irfan Sheriff · 14 years ago
  82. 35cc0fc am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 14 years ago
  83. dd729fc resolved conflicts for merge of d027329c to gingerbread-plus-aosp by Marco Nelissen · 14 years ago
  84. 76feee7 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) by Mathias Agopian · 14 years ago
  85. 48014c7 am 8688d470: Moving flag to a member field instead of a stack variable. by Dan Morrill · 14 years ago
  86. 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
  87. 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
  88. 7521344 am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" by Conley Owens · 14 years ago
  89. c66e252 Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" by Conley Owens · 14 years ago
  90. ff86daf am a02d9bf9: Make sure we don\'t read from invalid fds by Marco Nelissen · 14 years ago
  91. ef1e16f am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) by Mathias Agopian · 14 years ago
  92. 9a03cec Fix a leak in RefBase (DO NOT MERGE) by Mathias Agopian · 14 years ago
  93. 233fca9 am f3894a04: Merge "Tweak setViewport stuff for fwd-compat" by Jean-Baptiste Queru · 14 years ago
  94. 16b8446 Merge "Tweak setViewport stuff for fwd-compat" by Jean-Baptiste Queru · 14 years ago
  95. ca1df0c resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp by Jake Hamby · 14 years ago
  96. c7492c0 am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread by Xavier Ducrohet · 14 years ago
  97. 9bbc6b0 am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread by Xavier Ducrohet · 14 years ago
  98. 445abdc am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." by Romain Guy · 14 years ago
  99. 47a5fe5 Merge "Disable plugins if setPluginsEnabled(false) called." by Romain Guy · 14 years ago
  100. a533883 resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp by Jake Hamby · 14 years ago