1. 17cf0e5 resolved conflicts for merge of 66d633d2 to master by Dianne Hackborn · 15 years ago
  2. f89bba4 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread by Dianne Hackborn · 15 years ago
  3. a79061a Merge "Don't retain global ref to last inflated context." into gingerbread by Dianne Hackborn · 15 years ago
  4. 0b70da2 am 91fe7464: am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread by Chia-chi Yeh · 15 years ago
  5. f29dcb9 am d06e641d: am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread by Hung-ying Tyan · 15 years ago
  6. 82d6e71 am 14e00621: Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread by Chia-chi Yeh · 15 years ago
  7. 3898d53 Merge "Revert "RTP: integrate the echo canceller from speex."" into gingerbread by Chia-chi Yeh · 15 years ago
  8. 7a2b14a am 108a06c9: Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread by Hung-ying Tyan · 15 years ago
  9. 319741d am 5e0d8337: am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread by Chung-yih Wang · 15 years ago
  10. c369e4f Merge "CallManager: remove unused Phone argument from stopDtmf() and sendBurstDtmf()" into gingerbread by Hung-ying Tyan · 15 years ago
  11. cf1475b am ea52d35e: Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread by Chung-yih Wang · 15 years ago
  12. bf1f869 Merge "Add dynamic uid info for tracking the sip service usage." into gingerbread by Chung-yih Wang · 15 years ago
  13. 27b09d5 Merge "fix connectNetwork corner cases" by Irfan Sheriff · 15 years ago
  14. cf80408 Merge "System bar improvements." by Daniel Sandler · 15 years ago
  15. ed380df am 5a54e980: am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread by Konstantin Lopyrev · 15 years ago
  16. 9edfe72 Merge "Fix for end events from Sequencer objects" by Chet Haase · 15 years ago
  17. f8a7953 am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread by Konstantin Lopyrev · 15 years ago
  18. 7c4f53c Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread by Konstantin Lopyrev · 15 years ago
  19. 4ebb93a am d72c1172: am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread by Romain Guy · 15 years ago
  20. c59c763 am 0c490839: Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread by Romain Guy · 15 years ago
  21. 37f2bb9 Merge "reserve android.opengl.GLWallpaperService name for future use" into gingerbread by Romain Guy · 15 years ago
  22. abb0c2e am eb0e0f46: am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread by Kenny Root · 15 years ago
  23. f88784d am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread by Kenny Root · 15 years ago
  24. 4597abe Merge "Add LFH offset to verbose list of APK" into gingerbread by Kenny Root · 15 years ago
  25. 5f1bdf5 Merge "Add matrix component types. Fix potental overflow in script -> java messages." by Jason Sams · 15 years ago
  26. 9da5e13 am fde7fdd3: am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread by Dianne Hackborn · 15 years ago
  27. 8c5f798 am a62dfe9e: am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread by Mathias Agopian · 15 years ago
  28. c0b756d am e58cd37d: am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread by Andreas Huber · 15 years ago
  29. 413f750 am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread by Mathias Agopian · 15 years ago
  30. a9238c2 am 49209cbc: am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread by Brad Fitzpatrick · 15 years ago
  31. e4bdb9f am 50395e80: Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread by Dianne Hackborn · 15 years ago
  32. 85e9b6d Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread by Dianne Hackborn · 15 years ago
  33. 1442c72 am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread by Mathias Agopian · 15 years ago
  34. a1f8246 Merge "Improve Sensors documentation a bit" into gingerbread by Mathias Agopian · 15 years ago
  35. 8e1c9a4 Merge "MTP: work in progress on expanded property support" by Mike Lockwood · 15 years ago
  36. a5e3408 am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread by Andreas Huber · 15 years ago
  37. 9cca403 am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread by Mathias Agopian · 15 years ago
  38. c22873a Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread by Andreas Huber · 15 years ago
  39. 7cd54c1 Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread by Mathias Agopian · 15 years ago
  40. c54dd77 am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread by Brad Fitzpatrick · 15 years ago
  41. 3db1baf am 8ca5df27: am c14f9ca6: Merge "Added preset reverb." into gingerbread by Eric Laurent · 15 years ago
  42. 80344d1 Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread by Brad Fitzpatrick · 15 years ago
  43. 9ece77e am cec075cc: am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread by Andreas Huber · 15 years ago
  44. 13f956f am c14f9ca6: Merge "Added preset reverb." into gingerbread by Eric Laurent · 15 years ago
  45. eff062c fix [2946787] Screen flicker on low resolution setting in camcorder. by Mathias Agopian · 15 years ago
  46. b27990f Merge "Added preset reverb." into gingerbread by Eric Laurent · 15 years ago
  47. 119088c am 23584022: Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread by Andreas Huber · 15 years ago
  48. fc48cc9 Merge "Ensure that buffering updates eventually hit 100% after we download everything." into gingerbread by Andreas Huber · 15 years ago
  49. f0e3974 Merge "Only destroy the GL Canvas when necessary." by Romain Guy · 15 years ago
  50. 5b88dde Merge "Generated Romansh messages from Unicode CLDR." by Sascha Brawer · 15 years ago
  51. 45f0e75 Merge "simplify cursor ring draw state; fix null check" by Cary Clark · 15 years ago
  52. 52200d5 am 1ef41605: (-s ours) am d64f4a98: DO NOT MERGE fix null check by Cary Clark · 15 years ago
  53. 7264fd1 am d64f4a98: DO NOT MERGE fix null check by Cary Clark · 15 years ago
  54. 331b1e7 Merge "Cleanup and bug fixes in StackView -> pushed functionality from AdapterViewAnimator to StackView -> only modifying clipping flags as far up the view hierarchy as needed -> still need framework level solution for drawing outside bounds" by Adam Cohen · 15 years ago
  55. 361f6a9 am 96dc4559: am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread by Andreas Huber · 15 years ago
  56. 6d35200 am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread by Andreas Huber · 15 years ago
  57. 62c6ce2 Merge "Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now." into gingerbread by Andreas Huber · 15 years ago
  58. e34a3d1 am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread by Mathias Agopian · 15 years ago
  59. 2091772 am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread by Mathias Agopian · 15 years ago
  60. 150bd0b Merge "don't try to lock a buffer that wasn't allocated with SW usage bits" into gingerbread by Mathias Agopian · 15 years ago
  61. f1b3824 don't try to lock a buffer that wasn't allocated with SW usage bits by Mathias Agopian · 15 years ago
  62. 043f03f am 90b3135d: am 4d672988: Merge "Remove "StringTest.java"." into gingerbread by Brian Carlstrom · 15 years ago
  63. 0807f06 resolved conflicts for merge of 50d35946 to master by Brian Carlstrom · 15 years ago
  64. 6f56b21 am 4d672988: Merge "Remove "StringTest.java"." into gingerbread by Brian Carlstrom · 15 years ago
  65. 9730e61 Merge "Remove "StringTest.java"." into gingerbread by Brian Carlstrom · 15 years ago
  66. e58ed82 am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread by Brian Carlstrom · 15 years ago
  67. 731ba7f Merge "Added Romansh-language versions of error messages "loaderror.html" and "nodomain.html"." by Sascha Brawer · 15 years ago
  68. d61798d Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread by Brian Carlstrom · 15 years ago
  69. 9928d1b am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread by Eric Laurent · 15 years ago
  70. 3734308 am 67b50606: Merge "Fix the simulator build." into gingerbread by Eric Laurent · 15 years ago
  71. 944d8e9 Merge "Fix the simulator build." into gingerbread by Eric Laurent · 15 years ago
  72. 455d500 Merge "Fix in fundamentals web page." by Gilles Debunne · 15 years ago
  73. 101a4e1 Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null" by Steve Block · 15 years ago
  74. 045e446 Merge "Fixed typo in View id documentation" by Gilles Debunne · 15 years ago
  75. 4799c09 am 44b31fdd: am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  76. 19e9ecc am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  77. 1c07fd5 am d5e601c2: reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  78. fcf39c0 am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread by Brian Carlstrom · 15 years ago
  79. caaf169 am 59073b15: Merge "Fix linux 64 build" into gingerbread by Brian Carlstrom · 15 years ago
  80. a6c21c3 Merge "Add --el option to am for long extras." by Makoto Onuki · 15 years ago
  81. c1ee89a reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  82. fd30cf4 Merge "Fix linux 64 build" into gingerbread by Brian Carlstrom · 15 years ago
  83. 23dfdc7 Merge "Fix the documentation of ContentValues." by Jeff Hamilton · 15 years ago
  84. f508020 Merge "Change animator xml importing to use new inflater class" by Chet Haase · 15 years ago
  85. 330d93e resolved conflicts for merge of 20afae51 to master by Chih-Chung Chang · 15 years ago
  86. 55d979b am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread by Chih-Chung Chang · 15 years ago
  87. 20f8ea4 Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread by Chih-Chung Chang · 15 years ago
  88. cb7082e am 73497e92: am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread by Hung-ying Tyan · 15 years ago
  89. 763e768 am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread by Hung-ying Tyan · 15 years ago
  90. 7a84ed6 Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread by Hung-ying Tyan · 15 years ago
  91. fae2a9e am 22518947: am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread by Rohit Mungee · 15 years ago
  92. 62f8387 am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread by Rohit Mungee · 15 years ago
  93. 6d4d8c5 Merge "Add support for generated documentation as part of the SDK docs." into gingerbread by Rohit Mungee · 15 years ago
  94. acf08e3 am 1922ac10: (-s ours) am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread by Daisuke Miyakawa · 15 years ago
  95. b4b7396 am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread by Daisuke Miyakawa · 15 years ago
  96. 391adbe Merge "Fix the test breakage in vCard tests." into gingerbread by Daisuke Miyakawa · 15 years ago
  97. 938f7fd am 384759b1: am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo by Christopher Tate · 15 years ago
  98. 71d9781 am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo by Christopher Tate · 15 years ago
  99. 2a7b3eb am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo by Christopher Tate · 15 years ago
  100. 051183a am d335f9a9: am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread by Brad Fitzpatrick · 15 years ago