1. c01fd14 Merge "MediaScanner: Add special casing of WMP album art files to isNoMediaPath()" by Mike Lockwood · 14 years ago
  2. d27f9e0 Merge "resolved conflicts for merge of db46fa25 to master" by Robert Greenwalt · 14 years ago
  3. 32034f2 Merge "Line endcaps for AA lines are now antialiased." by Chet Haase · 14 years ago
  4. d3ff60d Merge "Remove unnecessary code." by Romain Guy · 14 years ago
  5. b571f38 resolved conflicts for merge of db46fa25 to master by Robert Greenwalt · 14 years ago
  6. de7be1a Merge "Moving renderscript GL code into the HAL This change affects - shaders - meshes - fonts - quad rendering" by Alex Sakhartchouk · 14 years ago
  7. bc30781 Merge "Temporarly disable auto-inbanding." by Jason Sams · 14 years ago
  8. b6d3de2 Merge "MediaScanner: Fix bug in "no media" handling logic" by Mike Lockwood · 14 years ago
  9. 50bd118 am d369d64e: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE by Irfan Sheriff · 14 years ago
  10. 8fa31b3 am a47c4019: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE by Robert Greenwalt · 14 years ago
  11. 62bcdb5 Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE by Robert Greenwalt · 14 years ago
  12. 2f31356 am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE by Irfan Sheriff · 14 years ago
  13. b2531a8 Resolve merge conflicts for merge of 21083066 to master. by Wink Saville · 14 years ago
  14. 3a1c7d2 am 0fa7d106: am aa44b52e: Fix bug in RIL#getDataCallState. by Wink Saville · 14 years ago
  15. 745fa56 am 7e74c60d: Merge "Enhance AsyncChannel." into honeycomb-LTE by Wink Saville · 14 years ago
  16. c2e50cd am aa44b52e: Fix bug in RIL#getDataCallState. by Wink Saville · 14 years ago
  17. 581b155 Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE by Irfan Sheriff · 14 years ago
  18. 9b81f6b Merge "Enhance AsyncChannel." into honeycomb-LTE by Wink Saville · 14 years ago
  19. e998120 am a3dcd0a3: (-s ours) Merged "Adjust mBiggerTouchSlopSquare to the suitable value" by Conley Owens · 14 years ago
  20. 8abc2b7 am dddaa56f: Merge commit \'b737647d\' (Scrolling using arrow keys with padding) into m by Conley Owens · 14 years ago
  21. 4c30f10 Merge commit 'f395e304' into m by Conley Owens · 14 years ago
  22. 5511a49 am 08acaec6: am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" by Conley Owens · 14 years ago
  23. 36f57da am 737b5c58: am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." by Conley Owens · 14 years ago
  24. a46dda3 am 1eb31b43: am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" by Conley Owens · 14 years ago
  25. 6d1298f am 64248af3: Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp by Conley Owens · 14 years ago
  26. 8a335fe am c30d7676: am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal by Conley Owens · 14 years ago
  27. 3ddb5a1 am faedfc1e: Ignore slide ui change because it is obselete in newly-refactored code by Conley Owens · 14 years ago
  28. de7c0f4 am 238ef85e: am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" by Conley Owens · 14 years ago
  29. 6d9b670 am 0921eae1: Ignore fix since it is obsolete in newly refactored code by Conley Owens · 14 years ago
  30. 1dd6ef0 am 92618f5f: am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" by Conley Owens · 14 years ago
  31. 96780f4 Merge commit '5eb49e0f' into m by Conley Owens · 14 years ago
  32. aa2f34f am ba40174b: am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" by Conley Owens · 14 years ago
  33. 0156ca8 am 33e86de0: Ignore broken image fix since identical change exists in internal tree by Conley Owens · 14 years ago
  34. ec732cd Merged "Adjust mBiggerTouchSlopSquare to the suitable value" by Conley Owens · 14 years ago
  35. bc2d5e4 Merge commit 'b737647d' (Scrolling using arrow keys with padding) into m by Conley Owens · 14 years ago
  36. ecd5f1c am 19653c64: am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" by Conley Owens · 14 years ago
  37. 7badf9c am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" by Conley Owens · 14 years ago
  38. 68bf235 am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter." by Conley Owens · 14 years ago
  39. 9b4283d am 718516f3: am 9fd8e057: Merge "Fix memory leak of SkMovie class" by Conley Owens · 14 years ago
  40. 0273cae Ignore ALT and SHIFT modifiers since they now exist in libs/ui/KeyCharacterMap.cpp by Conley Owens · 14 years ago
  41. 7eed38d am 1a846ab0: am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > by Conley Owens · 14 years ago
  42. 9392afe Ignore slide ui change because it is obselete in newly-refactored code by Conley Owens · 14 years ago
  43. 9428ff9 am af99655e: am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" by Conley Owens · 14 years ago
  44. 91461ae Ignore fix since it is obsolete in newly refactored code by Conley Owens · 14 years ago
  45. a6aa9d9 am 52749c0b: am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" by Conley Owens · 14 years ago
  46. d3241ca am e321d064: am 2f463ef1: Merge "Adding a sanity test in the while loop in readHistory()" by Conley Owens · 14 years ago
  47. b91ac99 am 7bcb2f39: am c5505f6a: Merge "Improved conversion accuracy of exif geotag data" by Conley Owens · 14 years ago
  48. 811a5fa Ignore broken image fix since identical change exists in internal tree by Conley Owens · 14 years ago
  49. bf89e85 Merge "Fix bug 4355588 With auto inbanding the fifo didn't reserve the correct size. Caused failure on fifo wrap." by Stephen Hines · 14 years ago
  50. d87f8f5 Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947" by Gloria Wang · 14 years ago
  51. a37b964 am dd177518: am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE by Wink Saville · 14 years ago
  52. aeb8096 am 6e748780: Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE by Wink Saville · 14 years ago
  53. 75bb55b Merge "CDMALTE: Evaluate data network type in pollStateDone()" into honeycomb-LTE by Wink Saville · 14 years ago
  54. 92ed994 Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156." by Gloria Wang · 14 years ago
  55. 7b29595 am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 14 years ago
  56. b36dad6 am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" by Conley Owens · 14 years ago
  57. a767c44 am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." by Conley Owens · 14 years ago
  58. 22c5e26 am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." by Conley Owens · 14 years ago
  59. c0f3e83 am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp by Conley Owens · 14 years ago
  60. 1ad9b43 am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check." by Conley Owens · 14 years ago
  61. 3a770d1 am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references." by Conley Owens · 14 years ago
  62. dc48b1b am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." by Conley Owens · 14 years ago
  63. b19bd46 am ded7c652: am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" by Conley Owens · 14 years ago
  64. fd28cfc Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base by Nick Kralevich · 14 years ago
  65. 77df00a Merge "Touch exploration - nits" by Svetoslav Ganov · 14 years ago
  66. 7e5c580 am 27ad0df0: am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 14 years ago
  67. 4e0afc2 am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 14 years ago
  68. 8b6be1a am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 14 years ago
  69. 7d2fef4 am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 14 years ago
  70. 9d09b81 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" by Conley Owens · 14 years ago
  71. 4609139 am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." by Conley Owens · 14 years ago
  72. b930fb2 am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." by Conley Owens · 14 years ago
  73. 34483e7 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp by Conley Owens · 14 years ago
  74. deed89f am 8b22ef66: am e41d2aed: Merge "Using robust equality check." by Conley Owens · 14 years ago
  75. d044b56 am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 14 years ago
  76. e8b9572 am a9517012: am 1e29552b: Merge "We don\'t need these local references." by Conley Owens · 14 years ago
  77. b3ac5ea am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." by Conley Owens · 14 years ago
  78. 0d1ed0a am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 14 years ago
  79. a7fe45c am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" by Conley Owens · 14 years ago
  80. 73e73d5 am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 14 years ago
  81. 8e06ace Merge "docs: more documentation for ProgressBar" into honeycomb by Scott Main · 14 years ago
  82. 57dbc02 Merge "Pipe rsa function though the RS api table." by Jason Sams · 14 years ago
  83. 7731380 Merge "Fix fifo size check code." by Jason Sams · 14 years ago
  84. b858714 am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 14 years ago
  85. aad1ad8 am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. by James Dong · 14 years ago
  86. 34db3e5 am c7eb47fa: docs: tweak table headers for config qualifiers by Scott Main · 14 years ago
  87. 1c52ae3 Merge "SuggestionSpans are removed around edited text." by Gilles Debunne · 14 years ago
  88. 7b0eaac am 67c92fbd: am 5f2ff42b: Add data to bugreports. by Robert Greenwalt · 14 years ago
  89. 2f56d20 am eb8171bc: Merge "Adjust mBiggerTouchSlopSquare to the suitable value" by Conley Owens · 14 years ago
  90. 05e4042 am 76616b13: Merge "Scolling using arrow keys with padding" by Conley Owens · 14 years ago
  91. 400c441 am 425db473: Merge "CHAR_SEQUENCE_CREATOR cannot handle null string" by Conley Owens · 14 years ago
  92. 88acc06 am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time" by Conley Owens · 14 years ago
  93. a7c8b48 am 9355a24a: Merge "Fixing wrong Japanese phone formatter." by Conley Owens · 14 years ago
  94. 5133e13 am 9fd8e057: Merge "Fix memory leak of SkMovie class" by Conley Owens · 14 years ago
  95. 78240a9 am 8ebf3558: Merge "Implement support for ALT and SHIFT modifiers" by Conley Owens · 14 years ago
  96. 078c9c8 am b1578d85: Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal by Conley Owens · 14 years ago
  97. 3b6b23e am 1ecd0a9b: Merge "modify the device to enable to get the state as slide-open/slide-close." by Conley Owens · 14 years ago
  98. b87efff am 69ef0d55: Merge "Adding missing breaks in BnSurfaceComposer::onTransact" by Conley Owens · 14 years ago
  99. 7ccbe8f am 7ae9f08a: Merge "Fixed to call computeVisibleRegions() when transparent value changed" by Conley Owens · 14 years ago
  100. aee2ca4 am 03daee63: Merge "frameworks/base: acquire lock on am only when needed" by Conley Owens · 14 years ago