1. 59d12ac am 01808a5b: resolved conflicts for merge of c5fd733f to jb-mr1-dev-plus-aosp by Raphael Moll · 11 years ago master ara-dev-release-20141107
  2. 01808a5 resolved conflicts for merge of c5fd733f to jb-mr1-dev-plus-aosp by Raphael Moll · 11 years ago
  3. c5fd733 Fix Windows SDK: disable emulator. DO NOT MERGE. by Raphael Moll · 11 years ago
  4. e8c5656 Fix implementatation of IAndroidTarget to use new API. do not merge. by Xavier Ducrohet · 11 years ago
  5. 2846db4 am 07f6904f: resolved conflicts for merge of 80f171f8 to jb-mr1-dev-plus-aosp by Raphael Moll · 11 years ago
  6. 07f6904 resolved conflicts for merge of 80f171f8 to jb-mr1-dev-plus-aosp by Raphael Moll · 11 years ago
  7. 5c0a8a6 SdkLib getLastestBuildTool shouldn't test for previews. DO NOT MERGE. by Raphael Moll · 11 years ago
  8. f8595ee Update plugin with refactored sdk-common API. DO NOT MERGE. by Xavier Ducrohet · 11 years ago
  9. 322bca1 Misc bug fixes DO NOT MERGE by Tor Norbye · 11 years ago
  10. 80f171f SDK: disable emulator. DO NOT MERGE. by Raphael Moll · 11 years ago
  11. 871273f am dba01032: am bd0029b0: Merge "Add more version checks." by Xavier Ducrohet · 11 years ago
  12. dba0103 am bd0029b0: Merge "Add more version checks." by Xavier Ducrohet · 11 years ago
  13. bd0029b Merge "Add more version checks." by Xavier Ducrohet · 11 years ago
  14. 1f0692b Add more version checks. by Xavier Ducrohet · 11 years ago
  15. 9a9db16 am a2b69f9b: am 125cc194: Merge "Add dependency on the 22.0 plugin." by Xavier Ducrohet · 11 years ago
  16. a2b69f9 am 125cc194: Merge "Add dependency on the 22.0 plugin." by Xavier Ducrohet · 11 years ago
  17. 125cc19 Merge "Add dependency on the 22.0 plugin." by Xavier Ducrohet · 11 years ago
  18. 0e50cbb Add dependency on the 22.0 plugin. by Xavier Ducrohet · 11 years ago
  19. 44b9a50 am 6481e362: am 8006569b: Merge "Make Java compiler classpath extendable" by Xavier Ducrohet · 11 years ago
  20. 6481e36 am 8006569b: Merge "Make Java compiler classpath extendable" by Xavier Ducrohet · 11 years ago
  21. 8006569 Merge "Make Java compiler classpath extendable" by Xavier Ducrohet · 11 years ago
  22. aa3a540 am cb7bc220: am 2c79fef8: Merge "Add missing @NonNull annotations on overridden method" by Tor Norbye · 11 years ago
  23. cb7bc22 am 2c79fef8: Merge "Add missing @NonNull annotations on overridden method" by Tor Norbye · 11 years ago
  24. 2c79fef Merge "Add missing @NonNull annotations on overridden method" by Tor Norbye · 11 years ago
  25. 5b40298 am b98f526d: am d67e7491: Merge "New "Daydream" ADT template." by Roman Nurik · 11 years ago
  26. b98f526 am d67e7491: Merge "New "Daydream" ADT template." by Roman Nurik · 11 years ago
  27. d67e749 Merge "New "Daydream" ADT template." by Roman Nurik · 11 years ago
  28. 683bb42 Add missing @NonNull annotations on overridden method by Tor Norbye · 11 years ago
  29. a73db20 New "Daydream" ADT template. by Chris Banes · 11 years ago
  30. a69f740 am fe7f3a6c: am 5e7f9a1c: Merge "Reuse device display code from sdk-common" by Tor Norbye · 11 years ago
  31. fe7f3a6 am 5e7f9a1c: Merge "Reuse device display code from sdk-common" by Tor Norbye · 11 years ago
  32. 5e7f9a1 Merge "Reuse device display code from sdk-common" by Tor Norbye · 11 years ago
  33. e0b5823 am e59d0522: am 3400286c: Merge "Fix project files for DeviceConfig" by Tor Norbye · 11 years ago
  34. e59d052 am 3400286c: Merge "Fix project files for DeviceConfig" by Tor Norbye · 11 years ago
  35. 3400286 Merge "Fix project files for DeviceConfig" by Tor Norbye · 11 years ago
  36. b12aed8 Reuse device display code from sdk-common by Tor Norbye · 11 years ago
  37. 6afc66d am 2e8c9e1b: am 6502a1b2: Merge "Add support for build-tools in ADT." by Xavier Ducrohet · 11 years ago
  38. 2e8c9e1 am 6502a1b2: Merge "Add support for build-tools in ADT." by Xavier Ducrohet · 11 years ago
  39. 6502a1b Merge "Add support for build-tools in ADT." by Xavier Ducrohet · 11 years ago
  40. 571ea14 Fix project files for DeviceConfig by Tor Norbye · 11 years ago
  41. 898334b am a2dc08a8: (-s ours) am 1ea36a33: Switch to SDK Repository v8. DO NOT MERGE. by Raphael Moll · 11 years ago
  42. a2dc08a am 1ea36a33: Switch to SDK Repository v8. DO NOT MERGE. by Raphael Moll · 11 years ago
  43. a5a0de4 Add support for build-tools in ADT. by Xavier Ducrohet · 11 years ago
  44. ee82464 Merge "Update ant's build.xml to support the build-tools SDK component." by Xavier Ducrohet · 11 years ago
  45. 1ea36a3 Switch to SDK Repository v8. DO NOT MERGE. by Raphael Moll · 11 years ago
  46. c6c81cd Update ant's build.xml to support the build-tools SDK component. by Xavier Ducrohet · 11 years ago
  47. b40b313 Merge "Build ADT IDE only on Linux" by Siva Velusamy · 11 years ago
  48. aa30ce0 Build ADT IDE only on Linux by Siva Velusamy · 11 years ago
  49. 163a10d Merge "52407: should add a newline at the end of autogenerated xml files" by Tor Norbye · 11 years ago
  50. 8e295a9 52407: should add a newline at the end of autogenerated xml files by Tor Norbye · 11 years ago
  51. 1f1c499 Merge "Build IDE script." by Raphael Moll · 11 years ago
  52. 3191924 Merge "Fix dependencies of adt plugins to depend on the right prebuilts." by Xavier Ducrohet · 11 years ago
  53. 9aacc56 Fix dependencies of adt plugins to depend on the right prebuilts. by Xavier Ducrohet · 11 years ago
  54. 4e6beeb Merge "Add BouncyCastle to adt-base." by Xavier Ducrohet · 11 years ago
  55. 2af9a9f Add BouncyCastle to adt-base. by Xavier Ducrohet · 11 years ago
  56. 524af41 Build IDE script. by Raphael Moll · 11 years ago
  57. a45f523 Merge "Rename project libraries." by Raphael Moll · 11 years ago
  58. b986057 Rename project libraries. by Raphael Moll · 11 years ago
  59. 8647d22 Merge "Fix build." by Ying Wang · 11 years ago
  60. d50dbbf Fix build. by Ying Wang · 11 years ago
  61. a0d1417 Merge "Fix ADT test compile error." by Raphael Moll · 11 years ago
  62. 0b0e73e Fix ADT test compile error. by Raphael Moll · 11 years ago
  63. dda67cd Merge "SDK: Delete projects moved to tools/base or tools/swt." by Raphael Moll · 11 years ago
  64. 6ddb326 Merge "Build SDK using prebuilts/devtools." by Raphael Moll · 11 years ago
  65. f6a5b59 SDK: Delete projects moved to tools/base or tools/swt. by Raphael Moll · 11 years ago
  66. bc982e5 Build SDK using prebuilts/devtools. by Raphael Moll · 11 years ago
  67. 7a9f8b7 Merge "53031 and 53032: XML formatting line separator fix" by Tor Norbye · 11 years ago
  68. 67833f7 53031 and 53032: XML formatting line separator fix by Tor Norbye · 11 years ago
  69. 11a3406 Merge "Fix nullness annotation" by Tor Norbye · 11 years ago
  70. 32a550a Merge "52887: Unable to format xml documents that begin with comments" by Tor Norbye · 11 years ago
  71. 8bc5b0d 52887: Unable to format xml documents that begin with comments by Tor Norbye · 11 years ago
  72. 1aa45f8 Merge "Use the SDK common XmlPrettyPrinter" by Tor Norbye · 11 years ago
  73. 13a9256 Use the SDK common XmlPrettyPrinter by Tor Norbye · 11 years ago
  74. 9e83d67 Merge "Restore LOCAL_PATH in sdkmanager/app/Android.mk" by Conley Owens · 11 years ago
  75. 60a9e12 Merge "SDK prebuilts: reorganize into tools/lib." by Raphael Moll · 11 years ago
  76. 0af5c58 Merge "Delete duplicate files" by Ying Wang · 11 years ago
  77. 1914972 Merge "Revert "Revert "Update ADT bundle to use Juno packages""" by Siva Velusamy · 11 years ago
  78. bae1695 Revert "Revert "Update ADT bundle to use Juno packages"" by Siva Velusamy · 11 years ago
  79. 66178f2 Fix nullness annotation by Tor Norbye · 11 years ago
  80. 724d6c7 SDK prebuilts: reorganize into tools/lib. by Raphael Moll · 11 years ago
  81. aa4b4a4 Restore LOCAL_PATH in sdkmanager/app/Android.mk by Conley Owens · 11 years ago
  82. 57c54fd Merge "Revert "Update ADT bundle to use Juno packages"" by Siva Velusamy · 11 years ago
  83. f95aa77 Revert "Update ADT bundle to use Juno packages" by Siva Velusamy · 11 years ago
  84. 7057593 Merge "Update ADT bundle to use Juno packages" by Siva Velusamy · 11 years ago
  85. 6617e76 Update ADT bundle to use Juno packages by Siva Velusamy · 11 years ago
  86. 4eb0479 Merge "9patch: Set default zoom level based on image size." by Siva Velusamy · 11 years ago
  87. 946dd41 9patch: Set default zoom level based on image size. by Siva Velusamy · 11 years ago
  88. 47ebdee Merge "New 'AppWidget' ADT Template." by Roman Nurik · 11 years ago
  89. 4d54754 Delete duplicate files by Ying Wang · 11 years ago
  90. fb13a83 Merge "Allow editing patch regions via dragging markers" by Siva Velusamy · 11 years ago
  91. ba27ccb Merge "Ignore layout bound markers during patch calculation" by Siva Velusamy · 11 years ago
  92. 857e2f8 Merge "Highlight regions on mouse hover." by Siva Velusamy · 11 years ago
  93. 9ff9002 Allow editing patch regions via dragging markers by Siva Velusamy · 11 years ago
  94. 6c69b41 Ignore layout bound markers during patch calculation by Siva Velusamy · 11 years ago
  95. 272f2c3 Highlight regions on mouse hover. by Siva Velusamy · 11 years ago
  96. 338855a Merge "Default to not showing lock regions" by Siva Velusamy · 11 years ago
  97. 1686496 Merge "Move components to separate classes." by Siva Velusamy · 11 years ago
  98. fdc73ec Merge "Use maven directory structure" by Siva Velusamy · 11 years ago
  99. 19c5f09 Merge "add gitignore" by Siva Velusamy · 11 years ago
  100. 50693f0 Default to not showing lock regions by Siva Velusamy · 11 years ago