1. 909e507 resolved conflicts for merge of 177b05d6 to master by Scott Main · 15 years ago
  2. e1da11c am abb50f15: Merge "docs: fix a couple api links" into gingerbread by Scott Main · 15 years ago
  3. 9623583 Merge "docs: fix a couple api links" into gingerbread by Scott Main · 15 years ago
  4. 71ff5d1 Merge "Fix ratingBarStyleSmall style in Holo theme." by Adam Powell · 15 years ago
  5. 8945499 am 4c8fda62: am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread by Nick Pelly · 15 years ago
  6. c51ff97 am b877a54a: (-s ours) am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread by Wu-cheng Li · 15 years ago
  7. a6194e9 am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread by Nick Pelly · 15 years ago
  8. 98da7c8 am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread by Wu-cheng Li · 15 years ago
  9. 3fa1a71 Merge "Fixed NdefTag parcelable conversion methods." into gingerbread by Nick Pelly · 15 years ago
  10. e22a282 Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread by Wu-cheng Li · 15 years ago
  11. b229afd Merge "Provide strings for text selection options in WebView." by Leon Scroggins · 15 years ago
  12. e51388d Merge "Add a JNI method to determine which HTTP stack is in use" by Steve Block · 15 years ago
  13. 20679c3 am d6abaf32: am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread by Nick Pelly · 15 years ago
  14. bbefc88 am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread by Nick Pelly · 15 years ago
  15. 58b8f2f Merge "Document getPollBytes() and getActivationBytes()." into gingerbread by Nick Pelly · 15 years ago
  16. e22e25f Merge "Fix bug 2964954 - Lists blow up if their adapter changes while detached." by Adam Powell · 15 years ago
  17. 7838968 am c2f78020: am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread by Dianne Hackborn · 15 years ago
  18. a207bdf am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread by Dianne Hackborn · 15 years ago
  19. 7dd8069 Merge "Fix issue #3126018: No way to specify NativeActivity's native method" into gingerbread by Dianne Hackborn · 15 years ago
  20. 6a86149 Merge "Fix bug 3005359 - onListItemClick and ActionMode conflict" by Adam Powell · 15 years ago
  21. a1ef8f9 Merge "Fixing the case of less than or equal to 5 items in StackView" by Adam Cohen · 15 years ago
  22. 5e871b4 Add test stubs for newly added methods. by Jeff Brown · 15 years ago
  23. bc9f053 am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread by Jeff Brown · 15 years ago
  24. b7efb89 am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread by Jeff Brown · 15 years ago
  25. 8e16621 Merge "make the back (previous track) button into a cancel button." by Joe Onorato · 15 years ago
  26. f35c873 Merge "Add unit tests for native input and fix bugs identified." into gingerbread by Jeff Brown · 15 years ago
  27. d182728 Merge "Fix list dividers for holo" by Adam Powell · 15 years ago
  28. ccbef13 Merge "Fix Caches singleton to avoid resource leaks" by Chet Haase · 15 years ago
  29. 337fbf2 am b34fe2f0: am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too. by Joe Onorato · 15 years ago
  30. 61d622e am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too. by Joe Onorato · 15 years ago
  31. dfce6a1 Ignore b04e3940 from gingerbread-plus-aosp - already in master by Jean-Baptiste Queru · 15 years ago
  32. fce8eb5 am c6d813b0: Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp by Jean-Baptiste Queru · 15 years ago
  33. b20c2cb Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp by Jean-Baptiste Queru · 15 years ago
  34. 3de3145 Merge "Fix rendering issue with layers." by Romain Guy · 15 years ago
  35. 3c3cc62 Add unit tests for native input and fix bugs identified. by Jeff Brown · 15 years ago
  36. 126e50a am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread by Eric Laurent · 15 years ago
  37. 638ba3b Merge "Fix error recovery when a drag can't be started" by Chris Tate · 15 years ago
  38. 7cb9185 am b6a2256e: Merge "Fix issue 3126094." into gingerbread by Eric Laurent · 15 years ago
  39. 48a862e Merge "Fix issue 3126094." into gingerbread by Eric Laurent · 15 years ago
  40. 2cab4ec am d3f5bf5a: am ecae6e06: Merge "Import translations for status bar." into gingerbread by Eric Fischer · 15 years ago
  41. 27538f6 am 288f1373: am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread by Eric Rowe · 15 years ago
  42. 85ac552 am f5b5d177: am 07f3bee2: Push Tag/NdefTag implementation details into the service. by Nick Pelly · 15 years ago
  43. 3f965b9 am ecae6e06: Merge "Import translations for status bar." into gingerbread by Eric Fischer · 15 years ago
  44. c9ce2b2 am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread by Eric Rowe · 15 years ago
  45. c6c9185 am 07f3bee2: Push Tag/NdefTag implementation details into the service. by Nick Pelly · 15 years ago
  46. 421e60c Merge "Fix bug 3105695 - Action modes in dialogs or other small windows" by Adam Powell · 15 years ago
  47. bfd5a12 Merge "Implement issue #3116702: New manifest tags for supported screen sizes" by Dianne Hackborn · 15 years ago
  48. 518ee6f Merge "Import translations for status bar." into gingerbread by Eric Fischer · 15 years ago
  49. 4f6f494 Merge "Change disable timeout for BT disable stress test" into gingerbread by Eric Rowe · 15 years ago
  50. 0cbf3fb am d13f5f4f: (-s ours) am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 15 years ago
  51. 04b7b00 am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 15 years ago
  52. 2e960b2 Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 15 years ago
  53. aea4dec am 26dc88af: am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread by Eric Fischer · 15 years ago
  54. fe73129 Merge "Expose (internally only) the number of animations currently running." by Brad Fitzpatrick · 15 years ago
  55. b0dedf5 am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread by Eric Fischer · 15 years ago
  56. 372f65c Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread by Eric Fischer · 15 years ago
  57. d119af7 Merge "Layoutlib_Create: Fix order of class adapters." by Xavier Ducrohet · 15 years ago
  58. abbbacd Merge "Layoutlib_create: fix binary name of delegate methods." by Xavier Ducrohet · 15 years ago
  59. 5a4fe41 Merge "Let double tap reflow text." by Shimeng (Simon) Wang · 15 years ago
  60. 5082b04 Merge "Ignore viewport viewScale in fixed viewport mode." by Shimeng (Simon) Wang · 15 years ago
  61. 6e88cac Merge "Fix for 3124993. Crash in Browser on long press." by Gilles Debunne · 15 years ago
  62. c01d0f9 resolved conflicts for merge of 9c7489f8 to master by Dianne Hackborn · 15 years ago
  63. c982f88 Merge "OMX extension to support storing meta data in video input buffers during recording" by James Dong · 15 years ago
  64. eeb96f6 am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread by Dianne Hackborn · 15 years ago
  65. 2cc1c8e Merge "Remove dependency on ASM util classes." by Xavier Ducrohet · 15 years ago
  66. 91d5ae0 Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread by Dianne Hackborn · 15 years ago
  67. a181008 am 2051a1be: am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api" by Xavier Ducrohet · 15 years ago
  68. 1664611 am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api" by Xavier Ducrohet · 15 years ago
  69. 68a821e Merge "Make layoutlib use the prebuilt of layoutlib_api" by Xavier Ducrohet · 15 years ago
  70. f98f11f Merge "Move improved cert chain handling from CertificateChainValidator to TrustManagerImpl" by Brian Carlstrom · 15 years ago
  71. 4175182 am faf53c0b: am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread by Kenny Root · 15 years ago
  72. e82f7ef am 02482e20: (-s ours) am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread by Justin Ho · 15 years ago
  73. 0952382 am 4f734cab: am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread by Dianne Hackborn · 15 years ago
  74. ba0f58b am 8783b0e2: am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread by Jeff Hamilton · 15 years ago
  75. e37e0f6 Merge "Reorganize PackageManager dump to avoid NPE" by Kenny Root · 15 years ago
  76. 3da1387 am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread by Kenny Root · 15 years ago
  77. d0c1be3 Merge "Exit immediately on some linklib failures" into gingerbread by Kenny Root · 15 years ago
  78. 5f2b657 am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread by Justin Ho · 15 years ago
  79. df8353f Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread by Justin Ho · 15 years ago
  80. 0110cb5 am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread by Dianne Hackborn · 15 years ago
  81. 17d9f81 am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread by Jeff Hamilton · 15 years ago
  82. 52a2315 Merge "Don't use two different variables to refer to mSnapshot." by Romain Guy · 15 years ago
  83. c965ad7 Merge "Fix 3122139, where previewing an attachment for the second time will fail." by Wei-Ta Chen · 15 years ago
  84. d00f4a0 Merge "Refinements to the notification icon area." by Daniel Sandler · 15 years ago
  85. 08c93a7 Merge "Update script for copying NDK headers/library." into gingerbread by Dianne Hackborn · 15 years ago
  86. 2dd1f42 Merge "Moving cursor to the end of the search query when set explicitly." by Dmitri Plotnikov · 15 years ago
  87. baea1f1 Merge "Don't perform glCopyTextImage with coordinates outside the buffer." by Romain Guy · 15 years ago
  88. 98c396a Merge "Pass whether a scroll is user-scrolled or not to webkit." by Shimeng (Simon) Wang · 15 years ago
  89. ecfb0ff Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread by Jeff Hamilton · 15 years ago
  90. f6cf998 Merge "Fix bug introduced in Change I856118d8." by Joe Onorato · 15 years ago
  91. 9e001ba am c81ec79d: am 0592832c: Merge "Attempt to fix simulator build." into gingerbread by Nick Pelly · 15 years ago
  92. ab9e756 am d78c8d8b: am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread by Mike Lockwood · 15 years ago
  93. 4b3d8bd am 7ba8c44e: am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread by Kenny Root · 15 years ago
  94. 21a9101 Merge "Fix native resource leak when OpenGL renderer is not being used." by Chet Haase · 15 years ago
  95. 4dac7a8 am 0592832c: Merge "Attempt to fix simulator build." into gingerbread by Nick Pelly · 15 years ago
  96. 93828ea am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread by Mike Lockwood · 15 years ago
  97. 9f46e87 am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread by Kenny Root · 15 years ago
  98. bf38e48 Merge "Attempt to fix simulator build." into gingerbread by Nick Pelly · 15 years ago
  99. bcd579d Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread by Mike Lockwood · 15 years ago
  100. 6d9d44a Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread by Kenny Root · 15 years ago