1. 0aa3856 resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp by Raphael · 15 years ago
  2. d7267fc Merge "Move <uses-sdk> before <application> in samples." by Raphael Moll · 15 years ago
  3. a3dc674 Move <uses-sdk> before <application> in samples. by Raphael Moll · 15 years ago
  4. 6e20b04 am f328f262: Merge "Remove .classpath and .project files" into gingerbread by Glenn Kasten · 15 years ago
  5. f328f26 Merge "Remove .classpath and .project files" into gingerbread by Glenn Kasten · 15 years ago
  6. d53c6f2 am 7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread by Megha Joshi · 15 years ago
  7. 7f39ff8 Merge "NFC sample app (DO NOT MERGE)" into gingerbread by Megha Joshi · 15 years ago
  8. 150dd16 NFC sample app (DO NOT MERGE) by Megha Joshi · 15 years ago
  9. 296326b am 809ec924: Native audio example by Glenn Kasten · 15 years ago
  10. 4e75b80 am 4bd402f5: Merge "Fix DOS end-of-lines in winusb INF file." by Raphael Moll · 15 years ago
  11. 4bd402f Merge "Fix DOS end-of-lines in winusb INF file." by Raphael Moll · 15 years ago
  12. 809ec92 Native audio example by Glenn Kasten · 15 years ago
  13. 66980b1 Fix DOS end-of-lines in winusb INF file. by Raphael Moll · 15 years ago
  14. 2b7aeaf am 186ce6d5: Merge "NDK: Last cleanup of the platform headers" into gingerbread by David 'Digit' Turner · 15 years ago
  15. 186ce6d Merge "NDK: Last cleanup of the platform headers" into gingerbread by David 'Digit' Turner · 15 years ago
  16. f7b0702 am cc5809bf: Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread by David 'Digit' Turner · 15 years ago
  17. 3c7c38b NDK: Last cleanup of the platform headers by David 'Digit' Turner · 15 years ago
  18. cc5809b Merge "ndk: Use __ANDROID__ instead of ANDROID." into gingerbread by David 'Digit' Turner · 15 years ago
  19. 655f02a am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread by Alexander Lucas · 15 years ago
  20. 48cc36d Merge "Added SIP Demo to sample apps." into gingerbread by Alexander Lucas · 15 years ago
  21. a025796 Added SIP Demo to sample apps. by Alexander Lucas · 15 years ago
  22. 9c92ae9 am 49fe761d: Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread by Dirk Dougherty · 15 years ago
  23. 49fe761 Merge "Cherry pick from master: Sample app and test package for a Service" into gingerbread by Dirk Dougherty · 15 years ago
  24. bf8c20f am bccecc2b: Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread by Roman Nurik · 15 years ago
  25. bccecc2 Merge "Add ApiDemo for android.media.audiofx (Visualizer and Equalizer)" into gingerbread by Roman Nurik · 15 years ago
  26. dc4800e am fc187b1e: Merge "update native_window.h ndk header" into gingerbread by David Turner · 15 years ago
  27. fc187b1 Merge "update native_window.h ndk header" into gingerbread by David Turner · 15 years ago
  28. 33d2190 am 10795d84: Declare localeconv() in <locale.h> by David 'Digit' Turner · 15 years ago
  29. 3323f59 update native_window.h ndk header by Mathias Agopian · 15 years ago
  30. a99a3ff ndk: Use __ANDROID__ instead of ANDROID. by David 'Digit' Turner · 15 years ago
  31. cbb9f0d Remove .classpath and .project files by Glenn Kasten · 15 years ago
  32. 10795d8 Declare localeconv() in <locale.h> by David 'Digit' Turner · 15 years ago
  33. 07d2955 am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts." by Raphael Moll · 15 years ago
  34. 4219799 Merge "SDK Windows: Package customized proguard.bat scripts." by Raphael Moll · 15 years ago
  35. 90c1d50 Add ApiDemo for android.media.audiofx (Visualizer and Equalizer) by Roman Nurik · 15 years ago
  36. c07ab4b am 5a2fb6ce: Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread by Mathias Agopian · 15 years ago
  37. 5a2fb6c Merge "Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID." into gingerbread by Mathias Agopian · 15 years ago
  38. ddc73f9 am 902b355d: Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread by Jack Palevich · 15 years ago
  39. 902b355 Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread by Jack Palevich · 15 years ago
  40. 844b1ed am f0c01122: simplify a bit the native-activity sample code by Mathias Agopian · 15 years ago
  41. 793509c Greatly simplify sample code by using EGL_NATIVE_VISUAL_ID. by Mathias Agopian · 15 years ago
  42. f0c0112 simplify a bit the native-activity sample code by Mathias Agopian · 15 years ago
  43. 4bd22f9 am a77c1bdd: Work on issue #3126018: No way to specify NativeActivity\'s native method by Dianne Hackborn · 15 years ago
  44. a77c1bd Work on issue #3126018: No way to specify NativeActivity's native method by Dianne Hackborn · 15 years ago
  45. 5c428f4 am 799754e1: Merge "Tools package was missing proguard.bat" by Raphael Moll · 15 years ago
  46. 799754e Merge "Tools package was missing proguard.bat" by Raphael Moll · 15 years ago
  47. f4320c6 SDK Windows: Package customized proguard.bat scripts. by Raphael Moll · 15 years ago
  48. 9ca6f2c Remove unused Grid object from LabelMaker.java class. by Jack Palevich · 15 years ago
  49. affd0f8 am 83c50ca7: Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn\'t support a preview size with the same aspect ratio as the device display." into gingerbread by Roman Nurik · 15 years ago
  50. 83c50ca Merge "Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display." into gingerbread by Roman Nurik · 15 years ago
  51. ccbd895 am 0c53c5b6: Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for ve by Scott Main · 15 years ago
  52. 0c53c5b Merge "Do not merge. This is a cherry-pick from froyo change I392406824607e2bdae646e3156433d82a9ed6521 Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options menu based on the 'selected' item (that's what a context menu is for). - include all drawables in the app, instead of using system resources." into gingerbread by Scott Main · 15 years ago
  53. b04a4f9 Tools package was missing proguard.bat by Raphael Moll · 15 years ago
  54. 742b1fb am c2d70d2a: Update native headers/library to match current platform. by Dianne Hackborn · 15 years ago
  55. 72dcdbb Update ApiDemos CameraPreview activity to properly center the preview in cases where the camera hardware doesn't support a preview size with the same aspect ratio as the device display. by Roman Nurik · 15 years ago
  56. c2d70d2 Update native headers/library to match current platform. by Dianne Hackborn · 15 years ago
  57. 94ce3f2 Cherry pick from master: Sample app and test package for a Service by Joe Malin · 15 years ago
  58. 875234d Do not merge. by Scott Main · 15 years ago
  59. 35ccee0 am 9bfa6f90: Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the s by Yu Shan Emily Lau · 15 years ago
  60. 9bfa6f9 Merge "1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. 2) Add a new option in the scripted monkey which can enter a string through the shell command input text <string>" into gingerbread by Yu Shan Emily Lau · 15 years ago
  61. 9b07277 am 0702c101: am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include by Scott Main · 15 years ago
  62. 0702c10 am 05523fb0: (-s ours) Do not merge. Revise NotePad application to use better practices such as - inflating menus from XML and supporting API Level 3 without the need for version qualifiers on resource directories. - to NOT include items in the options m by Scott Main · 15 years ago
  63. e8b4160 1) add the bugreport option which allow the scripted monkey to capature the bugrepor and save it to the sdcard wherenever there is a ANR, java crash and native crash. by Yu Shan Emily Lau · 15 years ago
  64. ddb133f am 834eb602: Fix bug in native activity demo. by Dianne Hackborn · 15 years ago
  65. 834eb60 Fix bug in native activity demo. by Dianne Hackborn · 15 years ago
  66. 05523fb Do not merge. by Scott Main · 15 years ago
  67. 35ac4e1 am 92df1283: Move samples to API 9 by Xavier Ducrohet · 15 years ago
  68. 92df128 Move samples to API 9 by Xavier Ducrohet · 15 years ago
  69. 83e4546 am 15b480d0: Remove the Tag app. by Jeff Hamilton · 15 years ago
  70. 15b480d Remove the Tag app. by Jeff Hamilton · 15 years ago
  71. e9e9755 am f8580cf6: A bunch of work on the UI. by Jeff Hamilton · 15 years ago
  72. 79bb341 am b19cc7ba: Merge "Update permission name for Tag app." into gingerbread by Nick Pelly · 15 years ago
  73. f8580cf A bunch of work on the UI. by Jeff Hamilton · 15 years ago
  74. b19cc7b Merge "Update permission name for Tag app." into gingerbread by Nick Pelly · 15 years ago
  75. df9f6a8 am f1b34883: Merge "Dummy java file in native-only apps is not needed anymore." into gingerbread by David Turner · 15 years ago
  76. f1b3488 Merge "Dummy java file in native-only apps is not needed anymore." into gingerbread by David Turner · 15 years ago
  77. c013897 Update permission name for Tag app. by Nick Pelly · 15 years ago
  78. 79ee0a9 am 8143be8d: Update device admin example to wipe SD card. by Dianne Hackborn · 15 years ago
  79. 8143be8 Update device admin example to wipe SD card. by Dianne Hackborn · 15 years ago
  80. 1cefa9f am 24277fdb: Merge "Set SDK samples to API 8 + gingerbread." into gingerbread by Xavier Ducrohet · 15 years ago
  81. 1e41661 am 66d61ef9: Merge "Add in MonkeyRunner to the Windows SDK." by Bill Napier · 15 years ago
  82. 66d61ef Merge "Add in MonkeyRunner to the Windows SDK." by Bill Napier · 15 years ago
  83. 24277fd Merge "Set SDK samples to API 8 + gingerbread." into gingerbread by Xavier Ducrohet · 15 years ago
  84. 95a7877 Set SDK samples to API 8 + gingerbread. by Raphael · 15 years ago
  85. c36f835 am 8149e894: Create a ParsedNdefMessage class with supporting implementations. by Nick Kralevich · 15 years ago
  86. 8149e89 Create a ParsedNdefMessage class with supporting implementations. by Nick Kralevich · 15 years ago
  87. 4a026a1 am ab67f493: Merge "Have getObjects() return ParsedNdefRecords" into gingerbread by Nick Kralevich · 15 years ago
  88. ab67f49 Merge "Have getObjects() return ParsedNdefRecords" into gingerbread by Nick Kralevich · 15 years ago
  89. da3b9b7 Have getObjects() return ParsedNdefRecords by Nick Kralevich · 15 years ago
  90. 2cff6ce am 4f3dcc85: Revert "Add utility for toggling settings from the cmd line." by Brett Chabot · 15 years ago
  91. 4f3dcc8 Revert "Add utility for toggling settings from the cmd line." by Brett Chabot · 15 years ago
  92. 1bc37bf am 85122d26: add some new mock ndef messages for testing. by Nick Kralevich · 15 years ago
  93. a46b8b6 am 4f6f93d5: Merge "Checkpoint work on the Tag app." into gingerbread by Jeff Hamilton · 15 years ago
  94. 85122d2 add some new mock ndef messages for testing. by Nick Kralevich · 15 years ago
  95. 4f6f93d Merge "Checkpoint work on the Tag app." into gingerbread by Jeff Hamilton · 15 years ago
  96. 928f3aa Checkpoint work on the Tag app. by Jeff Hamilton · 15 years ago
  97. 2b03173 am 5b599c31: Merge "Add utility for toggling settings from the cmd line." into gingerbread by Brett Chabot · 15 years ago
  98. dd3b6a8 am 99b80ab4: Merge "GB SDK: don\'t use HV2.bat when generating tools." into gingerbread by Xavier Ducrohet · 15 years ago
  99. 88be7a5 am 03751547: Assets moved to hdpi directory, mdpi version created by Gilles Debunne · 15 years ago
  100. 5b599c3 Merge "Add utility for toggling settings from the cmd line." into gingerbread by Brett Chabot · 15 years ago