1. fb28a3a resolved conflicts for merge of 0f4e3718 to master by Jean-Baptiste Queru · 12 years ago
  2. 0f4e371 Merge d2e4c25e by Jean-Baptiste Queru · 12 years ago
  3. d2e4c25 am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev by Dianne Hackborn · 12 years ago
  4. b715790 Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev by Dianne Hackborn · 12 years ago
  5. 04fc926 am 70b80f2a: am 7bfd28d7: am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev by Robert Ly · 12 years ago
  6. c60c594 am b1202d15: am 54c59287: am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev by Robert Ly · 12 years ago
  7. 70b80f2 am 7bfd28d7: am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev by Robert Ly · 12 years ago
  8. b1202d1 am 54c59287: am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev by Robert Ly · 12 years ago
  9. 7bfd28d am 4bfc9991: am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev by Robert Ly · 12 years ago
  10. 54c5928 am fd3b957b: am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev by Robert Ly · 12 years ago
  11. 4bfc999 am 5c0f9e99: Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev by Robert Ly · 12 years ago
  12. fd3b957 am f88a53d5: Merge "docs: support google css class for reference docs" into jb-mr1-dev by Robert Ly · 12 years ago
  13. 5c0f9e9 Merge "fix docs.js bug where changeApiLevel is getting called" into jb-mr1-dev by Robert Ly · 12 years ago
  14. f88a53d Merge "docs: support google css class for reference docs" into jb-mr1-dev by Robert Ly · 12 years ago
  15. 67d75f1 fix docs.js bug where changeApiLevel is getting called by Robert Ly · 12 years ago
  16. bc09aed am b1fb4417: am f8ea5ec7: am 838b0856: am df08adae: docs: add "Google Services" search tab by Scott Main · 12 years ago
  17. b1fb441 am f8ea5ec7: am 838b0856: am df08adae: docs: add "Google Services" search tab by Scott Main · 12 years ago
  18. f8ea5ec am 838b0856: am df08adae: docs: add "Google Services" search tab by Scott Main · 12 years ago
  19. 838b085 am df08adae: docs: add "Google Services" search tab by Scott Main · 12 years ago
  20. 06884f5 docs: support google css class for reference docs by Robert Ly · 12 years ago
  21. 07e91d2 am b0dd2733: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  22. b0dd273 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  23. aa48e74 Obviously JB MR1.1 should be Android 4.2.2. by Dianne Hackborn · 12 years ago
  24. df08ada docs: add "Google Services" search tab by Scott Main · 12 years ago
  25. dc64b2e JDP64 by The Android Automerger · 12 years ago
  26. e4ac051 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  27. 5808999 JDP60E by The Android Automerger · 12 years ago
  28. 2b1fa59 am 2a2eb040: am a5d5c010: am 408067be: am 8fa5351c: show build info only for android docs (not google) by Scott Main · 12 years ago
  29. 2a2eb04 am a5d5c010: am 408067be: am 8fa5351c: show build info only for android docs (not google) by Scott Main · 12 years ago
  30. a5d5c01 am 408067be: am 8fa5351c: show build info only for android docs (not google) by Scott Main · 12 years ago
  31. 408067b am 8fa5351c: show build info only for android docs (not google) by Scott Main · 12 years ago
  32. 8fa5351 show build info only for android docs (not google) by Scott Main · 12 years ago
  33. b1110e6 JDP60D by The Android Automerger · 12 years ago
  34. 0173056 am 3e847379: am 6e181e99: am 2b61bc38: am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev by Dirk Dougherty · 12 years ago
  35. 1d333b1 am da65c4c3: am cdb4807e: am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav by Scott Main · 12 years ago
  36. 3e84737 am 6e181e99: am 2b61bc38: am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev by Dirk Dougherty · 12 years ago
  37. da65c4c am cdb4807e: am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav by Scott Main · 12 years ago
  38. 6e181e9 am 2b61bc38: am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev by Dirk Dougherty · 12 years ago
  39. cdb4807 am 0504ec1e: am ac71b2b5: docs: revisions for google reference nav by Scott Main · 12 years ago
  40. 2b61bc3 am e0dceabd: Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev by Dirk Dougherty · 12 years ago
  41. e0dceab Merge "Doc template change: exclude articles from logic to add "prev/next" nav in training docs." into jb-mr1-dev by Dirk Dougherty · 12 years ago
  42. 0504ec1 am ac71b2b5: docs: revisions for google reference nav by Scott Main · 12 years ago
  43. 02ce23e am 097eaf90: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  44. 097eaf9 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  45. ac71b2b docs: revisions for google reference nav by Scott Main · 12 years ago
  46. 408149a JDP60C by The Android Automerger · 12 years ago
  47. bfba2df am 54ab8f4f: am bcd7ba84: am ee9dea65: am 8acd75aa: add google class for body by Robert Ly · 12 years ago
  48. 54ab8f4 am bcd7ba84: am ee9dea65: am 8acd75aa: add google class for body by Robert Ly · 12 years ago
  49. bcd7ba8 am ee9dea65: am 8acd75aa: add google class for body by Robert Ly · 12 years ago
  50. ee9dea6 am 8acd75aa: add google class for body by Robert Ly · 12 years ago
  51. 8acd75a add google class for body by Robert Ly · 12 years ago
  52. ef1930e am 06820a3a: am f5df12fc: am cddbc098: am 5747d38a: enforce margin change for nolist class in training articles by Scott Main · 12 years ago
  53. f97ad3d am b09a0447: am 529e7ca4: am 1e2934b0: am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev by Scott Main · 12 years ago
  54. e520c82 am 3339ad12: am b2542514: am ef8764da: am d2dd6e58: add support for gms javadocs by Robert Ly · 12 years ago
  55. 06820a3 am f5df12fc: am cddbc098: am 5747d38a: enforce margin change for nolist class in training articles by Scott Main · 12 years ago
  56. b09a044 am 529e7ca4: am 1e2934b0: am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev by Scott Main · 12 years ago
  57. 3339ad1 am b2542514: am ef8764da: am d2dd6e58: add support for gms javadocs by Robert Ly · 12 years ago
  58. f5df12f am cddbc098: am 5747d38a: enforce margin change for nolist class in training articles by Scott Main · 12 years ago
  59. 529e7ca am 1e2934b0: am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev by Scott Main · 12 years ago
  60. b254251 am ef8764da: am d2dd6e58: add support for gms javadocs by Robert Ly · 12 years ago
  61. 18dca5d Doc template change: exclude articles from logic to add "prev/next" nav in training docs. by Dirk Dougherty · 12 years ago
  62. cddbc09 am 5747d38a: enforce margin change for nolist class in training articles by Scott Main · 12 years ago
  63. 1e2934b am 4e477d7b: Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev by Scott Main · 12 years ago
  64. ef8764d am d2dd6e58: add support for gms javadocs by Robert Ly · 12 years ago
  65. 5747d38 enforce margin change for nolist class in training articles by Scott Main · 12 years ago
  66. 4e477d7 Merge "docs/css: break words that are too long to fit sidenav; add style for google javadocs" into jb-mr1-dev by Scott Main · 12 years ago
  67. ab4daf4 docs/css: break words that are too long to fit sidenav; add style for google javadocs by Scott Main · 12 years ago
  68. d2dd6e5 add support for gms javadocs by Robert Ly · 12 years ago
  69. 53e39ec am 1630826e: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  70. 1630826 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  71. 01ccbe7 am 875443d4: (-s ours) am 0ee58582: am afac6c90: Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  72. 8906584 am e76962d8: am 9cdd3ca5: am b3748f31: am 40e90998: add google services tab by Robert Ly · 12 years ago
  73. 875443d am 0ee58582: am afac6c90: Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  74. e76962d am 9cdd3ca5: am b3748f31: am 40e90998: add google services tab by Robert Ly · 12 years ago
  75. 9459265 JDP60B by The Android Automerger · 12 years ago
  76. 0ee5858 am afac6c90: Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  77. afac6c9 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 12 years ago
  78. fd74ba5 JOP40E by The Android Automerger · 12 years ago
  79. 527e612 am 8eb2bad5: am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products" by Jesse Hall · 12 years ago
  80. 8eb2bad am f8728e66: Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products" by Jesse Hall · 12 years ago
  81. f8728e6 Merge "Add emulator modules to PRODUCT_PACKAGES in full and sdk products" by Jesse Hall · 12 years ago
  82. 1493ad7 JDP60 by The Android Automerger · 12 years ago
  83. 1c38cdc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev by The Android Automerger · 12 years ago
  84. 9cdd3ca am b3748f31: am 40e90998: add google services tab by Robert Ly · 12 years ago
  85. b3748f3 am 40e90998: add google services tab by Robert Ly · 12 years ago
  86. 40e9099 add google services tab by Robert Ly · 12 years ago
  87. 229b137 Add emulator modules to PRODUCT_PACKAGES in full and sdk products by Jesse Hall · 12 years ago
  88. c86e4f3 am e6f3c033: am 36f6da28: am 7942a936: am d4cb7831: add \'external-link\' class for links that go off-site by Scott Main · 12 years ago
  89. e6f3c03 am 36f6da28: am 7942a936: am d4cb7831: add \'external-link\' class for links that go off-site by Scott Main · 12 years ago
  90. 36f6da2 am 7942a936: am d4cb7831: add \'external-link\' class for links that go off-site by Scott Main · 12 years ago
  91. 7942a93 am d4cb7831: add \'external-link\' class for links that go off-site by Scott Main · 12 years ago
  92. d4cb783 add 'external-link' class for links that go off-site by Scott Main · 12 years ago
  93. caf92d0 am d457787f: (-s ours) Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  94. d457787 Reconcile with jb-mr1.1-release - do not merge by The Android Open Source Project · 12 years ago
  95. b16c36e am 44686feb: am 1e351764: am 50a8ce10: am 7d131e0a: fix build by Robert Ly · 12 years ago
  96. 4b10b49 am 32bde8fd: am 0a7c8e2b: am 1aace7da: am 502c939f: docs: add support for an infinite number of nested lists in side nav by Scott Main · 12 years ago
  97. 2cfe4bc am b40018cf: am caee64a9: am f44a518c: am c69b7735: Put ANDROID_BUILD_PATHS before the system default PATH by Ying Wang · 12 years ago
  98. 44686fe am 1e351764: am 50a8ce10: am 7d131e0a: fix build by Robert Ly · 12 years ago
  99. 1e35176 am 50a8ce10: am 7d131e0a: fix build by Robert Ly · 12 years ago
  100. 50a8ce1 am 7d131e0a: fix build by Robert Ly · 12 years ago