1. 9f21373 am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities." by Jeff Brown · 14 years ago
  2. 04eb175 am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" by Jeff Brown · 14 years ago
  3. 38b77d4 am 6f5a837c: Merge "Fix getSwitchState according to device capabilities." by Jeff Brown · 14 years ago
  4. 4af616c am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" by Jeff Brown · 14 years ago
  5. c6d6863 Merge "Fix getSwitchState according to device capabilities." by Jeff Brown · 14 years ago
  6. 091c0f7 Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" by Jeff Brown · 14 years ago
  7. 7d4af3f am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" by Gloria Wang · 14 years ago
  8. fe70827 am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" by Gloria Wang · 14 years ago
  9. 0e3e14f Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" by Gloria Wang · 14 years ago
  10. 480f4bb am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." by Xavier Ducrohet · 14 years ago
  11. 1966e6f am 6b3a0123: Merge "Insert a break wraparound." by Xavier Ducrohet · 14 years ago
  12. a62b247 Merge "Insert a break wraparound." by Xavier Ducrohet · 14 years ago
  13. 1631bf5 am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes" by Mike Lockwood · 14 years ago
  14. c2c411d am 8f5dd9ad: Merge "GPS Provider Service changes" by Mike Lockwood · 14 years ago
  15. fca789b Merge "GPS Provider Service changes" by Mike Lockwood · 14 years ago
  16. 6b11545 am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" by Jean-Baptiste Queru · 14 years ago
  17. 8fdbdf4 am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" by Jean-Baptiste Queru · 14 years ago
  18. 8fdba3d Merge "Fix a compiling error when trying to use setBufferCount" by Jean-Baptiste Queru · 14 years ago
  19. 697bce0 Fix a compiling error when trying to use setBufferCount by Teng-Hui Zhu · 14 years ago
  20. 526587b am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." by Conley Owens · 14 years ago
  21. 6662266 am f87743e7: Merge "Prevent NullPointerException cases while using SipService." by Conley Owens · 14 years ago
  22. b1d918b Merge "Prevent NullPointerException cases while using SipService." by Conley Owens · 14 years ago
  23. 0581cb2 am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." by Jean-Baptiste Queru · 14 years ago
  24. 46b0fc9 am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." by Jean-Baptiste Queru · 14 years ago
  25. ae18259 Merge "Stagefright: Return error if codec takes too long to return a buffer." by Jean-Baptiste Queru · 14 years ago
  26. c1cf37d am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 14 years ago
  27. 061ad63 Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 14 years ago
  28. bbfbd30 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." by Derek Sollenberger · 14 years ago
  29. adbba1f am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." by Derek Sollenberger · 14 years ago
  30. 0ed90b7 Merge "Adding an optional param to the SurfaceTexture constructor." by Derek Sollenberger · 14 years ago
  31. 77c988c Adding an optional param to the SurfaceTexture constructor. by Derek Sollenberger · 14 years ago
  32. 5aa3d79 Fix getSwitchState according to device capabilities. by Michaël Burtin · 14 years ago
  33. 15c8cd4 am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" by Mike Lockwood · 14 years ago
  34. 70aee95 Support wrapping app processes to inject debug instrumentation. Bug: 4437846 by Jeff Brown · 14 years ago
  35. 7779a44 am bd1dee94: Merge "gps: Adding ip address for AGps" by Mike Lockwood · 14 years ago
  36. 7c95ffb Merge "gps: Adding ip address for AGps" by Mike Lockwood · 14 years ago
  37. b0e2827 am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" by Mike Lockwood · 14 years ago
  38. 956ddf56 am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" by Mike Lockwood · 14 years ago
  39. a9b8a06 Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" by Mike Lockwood · 14 years ago
  40. 126c631 am cd01ad7c: am 20339b24: Merge "Remove Debug Code" by Xavier Ducrohet · 14 years ago
  41. 7fa726e am 20339b24: Merge "Remove Debug Code" by Xavier Ducrohet · 14 years ago
  42. eff4cc7 Merge "Remove Debug Code" by Xavier Ducrohet · 14 years ago
  43. 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
  44. 44f57c0 am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" by Xavier Ducrohet · 14 years ago
  45. 060c1a8 Merge "DO NOT MERGE. may fix build on some version of gcc" by Xavier Ducrohet · 14 years ago
  46. aa59908 DO NOT MERGE. may fix build on some version of gcc by Mathias Agopian · 14 years ago
  47. 015be54 am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  48. 461653a am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  49. f0a8de9 am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  50. 6f4d39f am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  51. cf95800 Merge "frameworks/base: Cap the number of toasts that a package can post." by Dianne Hackborn · 14 years ago
  52. ac95550 Merge "frameworks/base: unlink death notifications of Vibrate requests" by Dianne Hackborn · 14 years ago
  53. 852f77c am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." by Xavier Ducrohet · 14 years ago
  54. e420976 am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." by Xavier Ducrohet · 14 years ago
  55. fe7fbed Merge "Layoutlib_create flag -p: don't change all accesses to public." by Xavier Ducrohet · 14 years ago
  56. fed1e90 am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  57. 2cc4e53 am 3cf03987: Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  58. c0e7a06 Merge "Continue idmap generation even if name lookup fails." by Kenny Root · 14 years ago
  59. e164ef4 am 594745ab: am b9f87f19: Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  60. a446055 am b9f87f19: Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  61. 813dac2 Merge "First pass tying into per-interface DNS cache" by Robert Greenwalt · 14 years ago
  62. 656ddbe am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  63. 029c315 am 9bac0a9f: Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  64. dd66568 Merge "Fix to compile for windows" by Xavier Ducrohet · 14 years ago
  65. 2cb8dfb am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  66. 97aaf7c am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  67. 0d4b073 Merge "Added Caching for PreProcessed PNGs" by Xavier Ducrohet · 14 years ago
  68. 5c0019b am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  69. 99f6033 am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  70. 6e06869 Merge "Add generation of dependency file for .ap_ package" by Xavier Ducrohet · 14 years ago
  71. a3563e8 am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  72. 0092886 am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  73. dae75dd am d40c93f6: Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  74. e74c354 am 42755155: Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  75. 166845b Merge "Add dependency generation to Aapt for R.java" by Xavier Ducrohet · 14 years ago
  76. c6c26cd Merge "Copy once-created R.java into library projects" by Xavier Ducrohet · 14 years ago
  77. 60f8195 am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  78. 61d3cf3 am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  79. 0d0cbd3 Merge "stagefright aacenc: Mark codeWord as UWord16" by Conley Owens · 14 years ago
  80. 4161a01 am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  81. 190218d am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  82. 9781293 am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  83. 1a2e048 am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  84. 07f2ce4 am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  85. b54c227 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  86. 2be5cc2 am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  87. c4bb455 am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  88. fde808c Merge "stagefright: Include stdlib.h for malloc/free" by Deckard Autoverifier · 14 years ago
  89. e51e21c Merge "stagefright amrwbenc: Remove a duplicate, unused file" by Deckard Autoverifier · 14 years ago
  90. 1ae41e2 Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" by Deckard Autoverifier · 14 years ago
  91. 605aac1 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" by Deckard Autoverifier · 14 years ago
  92. 8c5dd00 am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  93. 4b1d4a7 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  94. 9569289 Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Conley Owens · 14 years ago
  95. 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
  96. 99a444e am 9ff89495: am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  97. 04b3638 am 53cf7858: Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  98. 95c15ba Merge "Bluetooth: correcting return value from cancelDiscovery" by Jaikumar Ganesh · 14 years ago
  99. 3b7791c resolved conflicts for merge of 7816eded to gingerbread-plus-aosp by David 'Digit' Turner · 14 years ago
  100. 407c94a Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread by Nick Pelly · 14 years ago