1. 52200d5 am 1ef41605: (-s ours) am d64f4a98: DO NOT MERGE fix null check by Cary Clark · 15 years ago
  2. 7264fd1 am d64f4a98: DO NOT MERGE fix null check by Cary Clark · 15 years ago
  3. 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
  4. 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
  5. 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
  6. 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
  7. 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
  8. 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
  9. 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
  10. f1b3824 don't try to lock a buffer that wasn't allocated with SW usage bits by Mathias Agopian · 15 years ago
  11. 043f03f am 90b3135d: am 4d672988: Merge "Remove "StringTest.java"." into gingerbread by Brian Carlstrom · 15 years ago
  12. 0807f06 resolved conflicts for merge of 50d35946 to master by Brian Carlstrom · 15 years ago
  13. 6f56b21 am 4d672988: Merge "Remove "StringTest.java"." into gingerbread by Brian Carlstrom · 15 years ago
  14. 9730e61 Merge "Remove "StringTest.java"." into gingerbread by Brian Carlstrom · 15 years ago
  15. e58ed82 am 24bf70ca: Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread by Brian Carlstrom · 15 years ago
  16. 731ba7f Merge "Added Romansh-language versions of error messages "loaderror.html" and "nodomain.html"." by Sascha Brawer · 15 years ago
  17. d61798d Merge "Update AndroidRuntime with dalvik-dev changes" into gingerbread by Brian Carlstrom · 15 years ago
  18. 9928d1b am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbread by Eric Laurent · 15 years ago
  19. 3734308 am 67b50606: Merge "Fix the simulator build." into gingerbread by Eric Laurent · 15 years ago
  20. 944d8e9 Merge "Fix the simulator build." into gingerbread by Eric Laurent · 15 years ago
  21. 455d500 Merge "Fix in fundamentals web page." by Gilles Debunne · 15 years ago
  22. 101a4e1 Merge "In ActionBarImpl, only use mActionView after we've checked that it's non-null" by Steve Block · 15 years ago
  23. 045e446 Merge "Fixed typo in View id documentation" by Gilles Debunne · 15 years ago
  24. 4799c09 am 44b31fdd: am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  25. 19e9ecc am 7e2f87fa: am d5e601c2: reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  26. 1c07fd5 am d5e601c2: reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  27. fcf39c0 am 7517ffd1: am 59073b15: Merge "Fix linux 64 build" into gingerbread by Brian Carlstrom · 15 years ago
  28. caaf169 am 59073b15: Merge "Fix linux 64 build" into gingerbread by Brian Carlstrom · 15 years ago
  29. a6c21c3 Merge "Add --el option to am for long extras." by Makoto Onuki · 15 years ago
  30. c1ee89a reconcile open-source froyo into google variant by Jean-Baptiste Queru · 15 years ago
  31. fd30cf4 Merge "Fix linux 64 build" into gingerbread by Brian Carlstrom · 15 years ago
  32. 23dfdc7 Merge "Fix the documentation of ContentValues." by Jeff Hamilton · 15 years ago
  33. f508020 Merge "Change animator xml importing to use new inflater class" by Chet Haase · 15 years ago
  34. 330d93e resolved conflicts for merge of 20afae51 to master by Chih-Chung Chang · 15 years ago
  35. 55d979b am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread by Chih-Chung Chang · 15 years ago
  36. 20f8ea4 Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread by Chih-Chung Chang · 15 years ago
  37. cb7082e am 73497e92: am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread by Hung-ying Tyan · 15 years ago
  38. 763e768 am 37f709ae: Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread by Hung-ying Tyan · 15 years ago
  39. 7a84ed6 Merge "SipProfile: add isOutgoingCallAllowed() and new builder constructor" into gingerbread by Hung-ying Tyan · 15 years ago
  40. 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
  41. 62f8387 am bfc9325f: Merge "Add support for generated documentation as part of the SDK docs." into gingerbread by Rohit Mungee · 15 years ago
  42. 6d4d8c5 Merge "Add support for generated documentation as part of the SDK docs." into gingerbread by Rohit Mungee · 15 years ago
  43. acf08e3 am 1922ac10: (-s ours) am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread by Daisuke Miyakawa · 15 years ago
  44. b4b7396 am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread by Daisuke Miyakawa · 15 years ago
  45. 391adbe Merge "Fix the test breakage in vCard tests." into gingerbread by Daisuke Miyakawa · 15 years ago
  46. 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
  47. 71d9781 am 2b81d6dd: am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo by Christopher Tate · 15 years ago
  48. 2a7b3eb am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo by Christopher Tate · 15 years ago
  49. 051183a am d335f9a9: am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread by Brad Fitzpatrick · 15 years ago
  50. 29bb63f Merge "Fix passion build" by Romain Guy · 15 years ago
  51. 365d986 am bb0eb5ca: Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread by Brad Fitzpatrick · 15 years ago
  52. d11bc2f Merge "Negatively cache settings and proactively slurp settings into cache." into gingerbread by Brad Fitzpatrick · 15 years ago
  53. bc419f0 Merge "Image for Ia41a33d935ead704c1de439a0cfb0a55806cfe12" by Joe Malin · 15 years ago
  54. b37cb69 Merge "Make the default backup configuration "disabled; local transport selected"" into froyo by Christopher Tate · 15 years ago
  55. 4ad298c am bc4389ed: am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread by Mathias Agopian · 15 years ago
  56. d382b66 am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread by Andreas Huber · 15 years ago
  57. bdcd318 resolved conflicts for merge of d3cd2596 to master by Dianne Hackborn · 15 years ago
  58. 7623fe8 Merge "Use only one GL context per process, share chaches." by Romain Guy · 15 years ago
  59. 6aa6b73 am b32d0f23: am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread by Gilles Debunne · 15 years ago
  60. 6231879 am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread by Brad Fitzpatrick · 15 years ago
  61. 7d95b2f am ff547a59: (-s ours) am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread by Daisuke Miyakawa · 15 years ago
  62. 95acdcc am 8395b462: Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread by Mathias Agopian · 15 years ago
  63. a85cdcc Merge "fix [2931513] Add support for setting the orientation of an ANativeWindow" into gingerbread by Mathias Agopian · 15 years ago
  64. 3970466 am 28060c8a: (-s ours) am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread by Daisuke Miyakawa · 15 years ago
  65. b661d66 fix [2931513] Add support for setting the orientation of an ANativeWindow by Mathias Agopian · 15 years ago
  66. d334b0d Merge "More work on the renderscript sample" by Alex Sakhartchouk · 15 years ago
  67. a9c9a13 am 510f9f86: am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread by Robert Greenwalt · 15 years ago
  68. bbb5bec Merge "resolved conflicts for merge of 9765b2a0 to master" by Gilles Debunne · 15 years ago
  69. efe8928 resolved conflicts for merge of 9765b2a0 to master by Gilles Debunne · 15 years ago
  70. 6cfd881 am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread by Andreas Huber · 15 years ago
  71. 3087ca8 Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread by Andreas Huber · 15 years ago
  72. ab07f81 am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread by Dianne Hackborn · 15 years ago
  73. 6f4b2fb Merge "Verify that onPause() calls its superclass." into gingerbread by Dianne Hackborn · 15 years ago
  74. 1095f2b am 33e0d834: am b6d71351: Merge "LVM release 1.05 delivery" into gingerbread by Eric Laurent · 15 years ago
  75. fda651c Merge "Allow reliable detection of a message that is in use." by Wink Saville · 15 years ago
  76. 7acc86a Merge "Disable FEATURE_ACTION_BAR on windows with incompatible feature sets." by Adam Powell · 15 years ago
  77. dea27da am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread by Gilles Debunne · 15 years ago
  78. 734f574 Merge "Fix for an NPE in TextView." into gingerbread by Gilles Debunne · 15 years ago
  79. 016a98d am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread by Brad Fitzpatrick · 15 years ago
  80. 85e027d Merge "Some StrictMode API changes." into gingerbread by Brad Fitzpatrick · 15 years ago
  81. 19455ee am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread by Daisuke Miyakawa · 15 years ago
  82. 1543ffc am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread by Daisuke Miyakawa · 15 years ago
  83. 5090002 Merge "Fix vCard so that it looks at IM correctly." into gingerbread by Daisuke Miyakawa · 15 years ago
  84. c5c4078 Merge "Make VCardTestsBase public." into gingerbread by Daisuke Miyakawa · 15 years ago
  85. 8ea67e3 Merge "Add facilities for layout transitions" by Chet Haase · 15 years ago
  86. 498a19e Merge "change the DRT to use Light theme" by Guang Zhu · 15 years ago
  87. de0067f am 1537637c: am 3294d44b: Add confcall management to SIP calls by Hung-ying Tyan · 15 years ago
  88. 5e47fe0 am 2ac479fa: am a83987d2: Merge "RTP: integrate the echo canceller from speex." into gingerbread by Chia-chi Yeh · 15 years ago
  89. 647dd25 am 50246cd5: am 5b1f0c9f: Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread by Chia-chi Yeh · 15 years ago
  90. 871e481 Merge "resolved conflicts for merge of 0b7b9807 to master" by Brad Fitzpatrick · 15 years ago
  91. d7f5809 Merge "More final artwork for status bar." by Daniel Sandler · 15 years ago
  92. 2e20f7e resolved conflicts for merge of 0b7b9807 to master by Brad Fitzpatrick · 15 years ago
  93. 1047cdc Merge "Final status bar artwork." by Daniel Sandler · 15 years ago
  94. 761e488 am bacc3aa8: am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward by Jean-Baptiste Queru · 15 years ago
  95. 71cc43b am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread by Robert Greenwalt · 15 years ago
  96. bb6ddcb Merge "Send all Connectivity broadcasts." into gingerbread by Robert Greenwalt · 15 years ago
  97. fea39c6 am 6e549d1c: am f467ca08: Merge "More watermark work." into gingerbread by Dianne Hackborn · 15 years ago
  98. ae5f1df am 976b71e2: am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo by Dirk Dougherty · 15 years ago
  99. c3e860f resolved conflicts for merge of b037da40 to master by Kenny Root · 15 years ago
  100. e881894 am 02623128: resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp by Jean-Baptiste Queru · 15 years ago