Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / b052ecaa7e6ce40cec43efe5353b4bb12079aa55
  1. b052eca resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp by Xavier Ducrohet · 14 years ago
  2. 86e4303 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp by Xavier Ducrohet · 14 years ago
  3. a4350fc Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread by Xavier Ducrohet · 14 years ago
  4. 86409c8 am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 14 years ago
  5. 1c38872f Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 14 years ago
  6. ee38808 am 0dc8618d: Do not start RILReceiver if wifi-only. by Wink Saville · 14 years ago
  7. f951bbf Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  8. 3905bc6 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp by repo sync · 14 years ago
  9. be2ed6d resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp by repo sync · 14 years ago
  10. c96b669 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread by Alon Albert · 14 years ago
  11. 4b52ec4 LayoutLib: Original import of Honeycomb's layoutlib. do not merge. by Xavier Ducrohet · 14 years ago
  12. 0dc8618 Do not start RILReceiver if wifi-only. by Wink Saville · 14 years ago
  13. 36b0b85 am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 14 years ago
  14. 22577b8 am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 14 years ago
  15. 6588c7c am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb by Irfan Sheriff · 14 years ago
  16. 5ff79c3 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 14 years ago
  17. 9248e95 DO NOT MERGE Cherry-pick of Ie4026a7c back to GB by Dianne Hackborn · 14 years ago
  18. 5107eea Merge "DO NOT MERGE Add support for background scanning" into honeycomb by Irfan Sheriff · 14 years ago
  19. b1eea45 am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb by Scott Main · 14 years ago
  20. 201959a Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb by Scott Main · 14 years ago
  21. bb0c1a3 am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 14 years ago
  22. 32751e3 Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 14 years ago
  23. fc1c800 Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  24. b0e5326 am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb by Irfan Sheriff · 14 years ago
  25. a46a5cb Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb by Irfan Sheriff · 14 years ago
  26. 63a4f9f5 am c516c771: docs: fix md5 sums by Scott Main · 14 years ago
  27. c516c77 docs: fix md5 sums by Scott Main · 14 years ago
  28. 9add122 DO NOT MERGE - Increasing timeout to 60 sec by Alon Albert · 14 years ago
  29. ae388da DO NOT MERGE No backup of country and sleep policy by Irfan Sheriff · 14 years ago
  30. 20bfbd9 am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 14 years ago
  31. 76d0c76 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 14 years ago
  32. fa238f0 Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 14 years ago
  33. 02be2f1 am 2788e4f9: docs: fix some typos by Scott Main · 14 years ago
  34. d11ee90 docs: fix sensorevent code snippets bug: 3480932 by Scott Main · 14 years ago
  35. 2788e4f docs: fix some typos by Scott Main · 14 years ago
  36. 74ff3d2 DO NOT MERGE Add support for background scanning by Irfan Sheriff · 14 years ago
  37. 57b920b am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets by Justin Ho · 14 years ago
  38. a0946d6 am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread by Alon Albert · 14 years ago
  39. da34ab2 am 9208875e: Updated iconography for network status and adding 4G assets by Justin Ho · 14 years ago
  40. 1aba843d am ccc802e1: Merge "Support quoted parameters" into gingerbread by Alon Albert · 14 years ago
  41. 190d4e2 am c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb by Robert Ly · 14 years ago
  42. d316bff am 47928f89: Merge "docs: fix broken links" into honeycomb by Scott Main · 14 years ago
  43. d97c598 am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb by James Dong · 14 years ago
  44. 1943b8c am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb by Scott Main · 14 years ago
  45. 8bee412 am 9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb by Scott Main · 14 years ago
  46. 306115b6 am cba8efdf: Add more tags to the RenderScript sample listing. by Roman Nurik · 14 years ago
  47. 30eefe6 am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb by Dirk Dougherty · 14 years ago
  48. c49992c am 4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb by Roman Nurik · 14 years ago
  49. 4c9647c am beb01c93: Merge "DO NOT MERGE." into honeycomb by Nick Pelly · 14 years ago
  50. 976a3b4 am 4d62ef25: docs: revert ndk r6 by Scott Main · 14 years ago
  51. d80d6c5 am f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded by Scott Main · 14 years ago
  52. bf1f25d am 1f694390: docs: move 3.0 optimizing doc into the dev guide by Scott Main · 14 years ago
  53. c0775a2 egl: fixes for object refcounts by Michael I. Gold · 14 years ago
  54. c6c6fe9 Merge "doc change: fix missing code ending tag" into honeycomb by Robert Ly · 14 years ago
  55. 47928f8 Merge "docs: fix broken links" into honeycomb by Scott Main · 14 years ago
  56. 6c9b500 Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb by James Dong · 14 years ago
  57. 1fdabeb doc change: fix missing code ending tag by Robert Ly · 14 years ago
  58. 752a1b9 docs: fix broken links by Scott Main · 14 years ago
  59. 9208875 Updated iconography for network status and adding 4G assets by Justin Ho · 14 years ago
  60. 0ea4f0d Merge "docs: update highlights doc to remove preview" into honeycomb by Scott Main · 14 years ago
  61. 5c3582d docs: update highlights doc to remove preview by Scott Main · 14 years ago
  62. 9d5f35d Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb by Scott Main · 14 years ago
  63. cba8efd Add more tags to the RenderScript sample listing. by Roman Nurik · 14 years ago
  64. 060793e am 62f40c8b: (-s ours) am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 14 years ago
  65. e5410aa am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 14 years ago
  66. 2a1b706 docs: add breadcrumb trails to some docs, mostly manifest docs by Scott Main · 14 years ago
  67. 14460b9 Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed by James Dong · 14 years ago
  68. 7036d76 Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb by Dirk Dougherty · 14 years ago
  69. 4f4cab7 Merge "Document support for WebM/VP8 decoding." into honeycomb by Roman Nurik · 14 years ago
  70. 36d2d1b Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated by Dirk Dougherty · 14 years ago
  71. a02c3cb Document support for WebM/VP8 decoding. by Roman Nurik · 14 years ago
  72. ccc802e Merge "Support quoted parameters" into gingerbread by Alon Albert · 14 years ago
  73. beb01c9 Merge "DO NOT MERGE." into honeycomb by Nick Pelly · 14 years ago
  74. 4d62ef2 docs: revert ndk r6 by Scott Main · 14 years ago
  75. f870c5a docs: add new-child tags to hide the "new" tag when a parent list item is expanded by Scott Main · 14 years ago
  76. 1f69439 docs: move 3.0 optimizing doc into the dev guide by Scott Main · 14 years ago
  77. 4aede1a am 301431d9: Doc change: Final diff report for API 11. by Dirk Dougherty · 14 years ago
  78. 301431d Doc change: Final diff report for API 11. by Dirk Dougherty · 14 years ago
  79. b5d3508 resolved conflicts for merge of b842629c to honeycomb-plus-aosp by Scott Main · 14 years ago
  80. b842629 docs: update sizes and sums for tools and ndk by Scott Main · 14 years ago
  81. 62f40c8 am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 14 years ago
  82. 483f713 am e4da3934: Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb by Scott Main · 14 years ago
  83. e4da3934 Merge "docs: move new AIDL doc back into the existing doc, but move the side nav location out of tools" into honeycomb by Scott Main · 14 years ago
  84. 55d3fc1 am 163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb by Scott Main · 14 years ago
  85. 163413f Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb by Scott Main · 14 years ago
  86. 06912bd Support quoted parameters by Alon Albert · 14 years ago
  87. ad49216 am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 14 years ago
  88. a2090be am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 14 years ago
  89. 8bbd11c DO NOT MERGE. by Nick Pelly · 14 years ago
  90. 7118bde Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 14 years ago
  91. 58e3822 Fix for #12945: ProgressBar.setMax() will always redraw. by Michael Krehan · 14 years ago
  92. d2acfd6 am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb by Robert Ly · 14 years ago
  93. aa68085 am 0ddd2d1e: DO NOT MERGE Delete unused/broken samples and tests from the renderscript libs, so we can publish the entire contents of libs/rs/java/ for samples in HC by Scott Main · 14 years ago
  94. a58f58d Merge "Doc change: fixing renderscript samples" into honeycomb by Robert Ly · 14 years ago
  95. adaf5a7 docs: update getting started doc for 3.0; move out of preview docs by Scott Main · 14 years ago
  96. 6518f48 Doc change: fixing renderscript samples by Robert Ly · 14 years ago
  97. 99cca89 Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 14 years ago
  98. 0ddd2d1 DO NOT MERGE by Scott Main · 14 years ago
  99. 831a089 am e766fcd5: DOC CHANGE: Bug 3396898 add attribute uses-library by Joe Malin · 14 years ago
  100. e766fcd DOC CHANGE: Bug 3396898 add attribute uses-library by Joe Malin · 14 years ago