1. b879147 resolved conflicts for merge of 9084631d to gingerbread-plus-aosp by Gloria Wang · 14 years ago
  2. 9084631 Merge "DRM framework support: - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback" by Gloria Wang · 14 years ago
  3. d577091 DRM framework support: by Gloria Wang · 14 years ago
  4. 67bb674 am 17efcde1: Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread by Adam Powell · 14 years ago
  5. 17efcde Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread by Adam Powell · 14 years ago
  6. 177b05d am abb50f15: Merge "docs: fix a couple api links" into gingerbread by Scott Main · 14 years ago
  7. abb50f1 Merge "docs: fix a couple api links" into gingerbread by Scott Main · 14 years ago
  8. b9b8f7b DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest by Adam Powell · 14 years ago
  9. 4c8fda6 am 79e76f52: Merge "Fixed NdefTag parcelable conversion methods." into gingerbread by Nick Pelly · 14 years ago
  10. b877a54 am 89821204: Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread by Wu-cheng Li · 14 years ago
  11. 79e76f5 Merge "Fixed NdefTag parcelable conversion methods." into gingerbread by Nick Pelly · 14 years ago
  12. 8982120 Merge "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge" into gingerbread by Wu-cheng Li · 14 years ago
  13. e2e4ea9 Fixed NdefTag parcelable conversion methods. by Sylvain Fonteneau · 14 years ago
  14. 994c02b Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge by Wu-cheng Li · 14 years ago
  15. d6abaf3 am 145550a0: Merge "Document getPollBytes() and getActivationBytes()." into gingerbread by Nick Pelly · 14 years ago
  16. 145550a Merge "Document getPollBytes() and getActivationBytes()." into gingerbread by Nick Pelly · 14 years ago
  17. 416d72f Document getPollBytes() and getActivationBytes(). by Nick Pelly · 14 years ago
  18. c2f7802 am 23656899: Merge "Fix issue #3126018: No way to specify NativeActivity\'s native method" into gingerbread by Dianne Hackborn · 14 years ago
  19. 2365689 Merge "Fix issue #3126018: No way to specify NativeActivity's native method" into gingerbread by Dianne Hackborn · 14 years ago
  20. e21d91c Fix issue #3126018: No way to specify NativeActivity's native method by Dianne Hackborn · 14 years ago
  21. 2ef3676 am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread by Jeff Brown · 14 years ago
  22. 860c2df Merge "Add unit tests for native input and fix bugs identified." into gingerbread by Jeff Brown · 14 years ago
  23. b34fe2f am 60607a90: Make sure that when the screen is off, we don\'t try to turn the buttons on too. by Joe Onorato · 14 years ago
  24. b04e394 Fixes for simulator build on lucid by Mike Lockwood · 14 years ago
  25. c6d813b Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp by Jean-Baptiste Queru · 14 years ago
  26. 60607a9 Make sure that when the screen is off, we don't try to turn the buttons on too. by Joe Onorato · 14 years ago
  27. c3db858 Add unit tests for native input and fix bugs identified. by Jeff Brown · 14 years ago
  28. 38655c0 Introduce a list of all the audio files by Jean-Baptiste Queru · 14 years ago
  29. 5a9d273 am b6a2256e: Merge "Fix issue 3126094." into gingerbread by Eric Laurent · 14 years ago
  30. b6a2256 Merge "Fix issue 3126094." into gingerbread by Eric Laurent · 14 years ago
  31. d3f5bf5 am ecae6e06: Merge "Import translations for status bar." into gingerbread by Eric Fischer · 14 years ago
  32. 288f137 am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread by Eric Rowe · 14 years ago
  33. f5b5d17 am 07f3bee2: Push Tag/NdefTag implementation details into the service. by Nick Pelly · 14 years ago
  34. cc02ac5 Fix issue 3126094. by Eric Laurent · 14 years ago
  35. ecae6e0 Merge "Import translations for status bar." into gingerbread by Eric Fischer · 14 years ago
  36. 8de43ab Merge "Change disable timeout for BT disable stress test" into gingerbread by Eric Rowe · 14 years ago
  37. 4aa82a7 Import translations for status bar. by Eric Fischer · 14 years ago
  38. 8675683 Change disable timeout for BT disable stress test by Eric Rowe · 14 years ago
  39. 07f3bee Push Tag/NdefTag implementation details into the service. by Nick Pelly · 14 years ago
  40. d13f5f4 am 67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 14 years ago
  41. 67496e5 Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 14 years ago
  42. 26dc88a am a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread by Eric Fischer · 14 years ago
  43. a3e70a4 Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread by Eric Fischer · 14 years ago
  44. 36504f2 Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  45. c5cde13 Add a space before the weekday in the zh_CN lock screen date format. by Eric Fischer · 14 years ago
  46. 9c7489f am 38993d8d: Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread by Dianne Hackborn · 14 years ago
  47. 38993d8 Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread by Dianne Hackborn · 14 years ago
  48. 2051a1b am c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api" by Xavier Ducrohet · 14 years ago
  49. c5371fa Merge "Make layoutlib use the prebuilt of layoutlib_api" by Xavier Ducrohet · 14 years ago
  50. 5383f50 Fix issue #3122240: Expose xlarge in GB. by Dianne Hackborn · 14 years ago
  51. faf53c0 am 40763914: Merge "Exit immediately on some linklib failures" into gingerbread by Kenny Root · 14 years ago
  52. 4076391 Merge "Exit immediately on some linklib failures" into gingerbread by Kenny Root · 14 years ago
  53. 02482e2 am 0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread by Justin Ho · 14 years ago
  54. 0b01eb2 Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread by Justin Ho · 14 years ago
  55. 4f734ca am 7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread by Dianne Hackborn · 14 years ago
  56. 8783b0e am 7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread by Jeff Hamilton · 14 years ago
  57. 3162a3c DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator by Justin Ho · 14 years ago
  58. 7ce276b Merge "Update script for copying NDK headers/library." into gingerbread by Dianne Hackborn · 14 years ago
  59. 7c68bc3 Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread by Jeff Hamilton · 14 years ago
  60. c81ec79 am 0592832c: Merge "Attempt to fix simulator build." into gingerbread by Nick Pelly · 14 years ago
  61. d78c8d8 am f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread by Mike Lockwood · 14 years ago
  62. 7ba8c44 am 8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread by Kenny Root · 14 years ago
  63. 0592832 Merge "Attempt to fix simulator build." into gingerbread by Nick Pelly · 14 years ago
  64. 1af97f0 Attempt to fix simulator build. by Nick Pelly · 14 years ago
  65. f6572e7 Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread by Mike Lockwood · 14 years ago
  66. 8ad30b5 Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread by Kenny Root · 14 years ago
  67. edc0f38 GPS: Fix network type logic in requestRefLocation by Mike Lockwood · 14 years ago
  68. d4d3f36 am 1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread by Hung-ying Tyan · 14 years ago
  69. 1257d33 Merge "Clean up pending sessions on incoming call in SipService" into gingerbread by Hung-ying Tyan · 14 years ago
  70. da83f51 Unhide some NFC APIs that are required for the Tag app. by Jeff Hamilton · 14 years ago
  71. de5ba5e Update script for copying NDK headers/library. by Dianne Hackborn · 14 years ago
  72. de8635e am 389a440a: Backport ParcelFileDescriptor.createPipe() from master. by Jeff Hamilton · 14 years ago
  73. 389a440 Backport ParcelFileDescriptor.createPipe() from master. by Jeff Hamilton · 14 years ago
  74. 6123e0f am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread by James Dong · 14 years ago
  75. eb5aeae am fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread by Dianne Hackborn · 14 years ago
  76. 101f14b am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread by Dianne Hackborn · 14 years ago
  77. 86f1b64 am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread by Dianne Hackborn · 14 years ago
  78. 1bd8a8c Merge "Turn the media time adjustment in file writer back on" into gingerbread by James Dong · 14 years ago
  79. fdbb216 Merge "Adjust boundaries for screen sizes." into gingerbread by Dianne Hackborn · 14 years ago
  80. ba50178 Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread by Dianne Hackborn · 14 years ago
  81. bf5efba Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread by Dianne Hackborn · 14 years ago
  82. db28a94 Fix issue #3117918: No way to finish a native activity by Dianne Hackborn · 14 years ago
  83. 89a0104 Turn the media time adjustment in file writer back on by James Dong · 14 years ago
  84. 0db3844 Make layoutlib use the prebuilt of layoutlib_api by Xavier Ducrohet · 14 years ago
  85. 482284a am 6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread by Jeff Brown · 14 years ago
  86. 6b3178a Merge "Fix a race condition in wallpaper move throttling." into gingerbread by Jeff Brown · 14 years ago
  87. 60c45d0 Clean up pending sessions on incoming call in SipService by Hung-ying Tyan · 14 years ago
  88. 840db1f Fix a race condition in wallpaper move throttling. by Jeff Brown · 14 years ago
  89. 2f1eee3 am e9dbf208: Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread by Dianne Hackborn · 14 years ago
  90. e9dbf20 Merge "Fix issue #3117472: Format storage dialog still broken" into gingerbread by Dianne Hackborn · 14 years ago
  91. 49af98e am aa6df366: Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread by Mathias Agopian · 14 years ago
  92. aa6df36 Merge "fix [3119687] [Maps][4.6.0] Force close in street view" into gingerbread by Mathias Agopian · 14 years ago
  93. 4f6ee25 Fix issue #3117472: Format storage dialog still broken by Dianne Hackborn · 14 years ago
  94. 46beb43 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread by Mathias Agopian · 14 years ago
  95. d7cd560 am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES by Kenny Root · 14 years ago
  96. 0c63605 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread by Mathias Agopian · 14 years ago
  97. 0332d1c Exit immediately on some linklib failures by Kenny Root · 14 years ago
  98. c4e84b8 fix [3119687] [Maps][4.6.0] Force close in street view by Mathias Agopian · 14 years ago
  99. 1d79a9d Use correct size of GAMEPAD_KEYCODES by Kenny Root · 14 years ago
  100. b51dc0f Adjust boundaries for screen sizes. by Dianne Hackborn · 14 years ago