Gitiles
Code Review Sign In
gerrit.omnirom.org / android_frameworks_native / 33d29351754350f28ef048eadb016ba58a54a176
  1. 33d2935 am b7a8c1e7: Merge "Doc change: fixing errors in library proj docs" into honeycomb by Robert Ly · 15 years ago
  2. 8e41e13 Merge "Doc change: fixing errors in library proj docs" into honeycomb by Robert Ly · 15 years ago
  3. 3d58870 am 00e08463: Doc change: clarifying nfc tech filter usage by Robert Ly · 15 years ago
  4. 5000d24 am db1acf52: (-s ours) am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread by Xavier Ducrohet · 15 years ago
  5. 6043f96 resolved conflicts for merge of 86e43034 to honeycomb-plus-aosp by Xavier Ducrohet · 15 years ago
  6. a79113b am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread by Xavier Ducrohet · 15 years ago
  7. c806fe1 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp by Xavier Ducrohet · 15 years ago
  8. be82ce2 Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread by Xavier Ducrohet · 15 years ago
  9. e90a80a Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread by Xavier Ducrohet · 15 years ago
  10. adc551c am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 15 years ago
  11. 78948e6 Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 15 years ago
  12. 2b58190 am 0dc8618d: Do not start RILReceiver if wifi-only. by Wink Saville · 15 years ago
  13. 8097bcc am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp by repo sync · 15 years ago
  14. 4923011 resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp by repo sync · 15 years ago
  15. 1f3dcff 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 · 15 years ago
  16. cba9291 am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 15 years ago
  17. 0b270d3 am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 15 years ago
  18. 48f8e87 am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb by Irfan Sheriff · 15 years ago
  19. 9281fda Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 15 years ago
  20. fe35362 Merge "DO NOT MERGE Add support for background scanning" into honeycomb by Irfan Sheriff · 15 years ago
  21. 05f5f4e am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb by Scott Main · 15 years ago
  22. 096db9e Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb by Scott Main · 15 years ago
  23. d189adf am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 15 years ago
  24. 5705228 Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 15 years ago
  25. c0be044 am a46a5cba: Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb by Irfan Sheriff · 15 years ago
  26. 5ebcc6f Merge "DO NOT MERGE No backup of country and sleep policy" into honeycomb by Irfan Sheriff · 15 years ago
  27. 03caa35 am c516c771: docs: fix md5 sums by Scott Main · 15 years ago
  28. 38b95b0 am 76d0c763: (-s ours) am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 15 years ago
  29. a5c7de6 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 15 years ago
  30. 8a5d77b Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 15 years ago
  31. 43e081b am 2788e4f9: docs: fix some typos by Scott Main · 15 years ago
  32. f2676bb am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets by Justin Ho · 15 years ago
  33. c887d5c am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread by Alon Albert · 15 years ago
  34. 3c48c35 am 9208875e: Updated iconography for network status and adding 4G assets by Justin Ho · 15 years ago
  35. 9427552 am ccc802e1: Merge "Support quoted parameters" into gingerbread by Alon Albert · 15 years ago
  36. 73a8ca3 am c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb by Robert Ly · 15 years ago
  37. 790827f am 47928f89: Merge "docs: fix broken links" into honeycomb by Scott Main · 15 years ago
  38. 2b389b5 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 · 15 years ago
  39. c331cf3 am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb by Scott Main · 15 years ago
  40. 2c3211a am 9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb by Scott Main · 15 years ago
  41. 56096b7 am cba8efdf: Add more tags to the RenderScript sample listing. by Roman Nurik · 15 years ago
  42. 075fb8d am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb by Dirk Dougherty · 15 years ago
  43. 456d1a9 am 4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb by Roman Nurik · 15 years ago
  44. 5c3de22 am beb01c93: Merge "DO NOT MERGE." into honeycomb by Nick Pelly · 15 years ago
  45. 6dbf9ee am 4d62ef25: docs: revert ndk r6 by Scott Main · 15 years ago
  46. f3ae0bd am f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded by Scott Main · 15 years ago
  47. c84bd4c am 1f694390: docs: move 3.0 optimizing doc into the dev guide by Scott Main · 15 years ago
  48. 3e52713 egl: fixes for object refcounts by Michael I. Gold · 15 years ago
  49. 8a53f66 Merge "doc change: fix missing code ending tag" into honeycomb by Robert Ly · 15 years ago
  50. 1287cd2 Merge "docs: fix broken links" into honeycomb by Scott Main · 15 years ago
  51. 14b4aa8 Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb by James Dong · 15 years ago
  52. bc20a56 Merge "docs: update highlights doc to remove preview" into honeycomb by Scott Main · 15 years ago
  53. acc6b03 Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb by Scott Main · 15 years ago
  54. 6030f4e am 62f40c8b: (-s ours) am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 15 years ago
  55. 586b7f4 am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 15 years ago
  56. 809780b Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb by Dirk Dougherty · 15 years ago
  57. e3d7294 Merge "Document support for WebM/VP8 decoding." into honeycomb by Roman Nurik · 15 years ago
  58. 61d36d7 Merge "Support quoted parameters" into gingerbread by Alon Albert · 15 years ago
  59. f8f4b97 Merge "DO NOT MERGE." into honeycomb by Nick Pelly · 15 years ago
  60. 2c0e9e9 am 301431d9: Doc change: Final diff report for API 11. by Dirk Dougherty · 15 years ago
  61. de80fa0 resolved conflicts for merge of b842629c to honeycomb-plus-aosp by Scott Main · 15 years ago
  62. b36b9f3 am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 15 years ago
  63. 286971d 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 · 15 years ago
  64. b5e284f 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 · 15 years ago
  65. 677eab0 am 163413f4: Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb by Scott Main · 15 years ago
  66. 689b5b8 Merge "docs: update getting started doc for 3.0; move out of preview docs" into honeycomb by Scott Main · 15 years ago
  67. 8ca2b0d am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 15 years ago
  68. d4cd30c am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 15 years ago
  69. 2151cef Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 15 years ago
  70. d2e169c am a58f58da: Merge "Doc change: fixing renderscript samples" into honeycomb by Robert Ly · 15 years ago
  71. 12a71bd 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 · 15 years ago
  72. f54cc8c Merge "Doc change: fixing renderscript samples" into honeycomb by Robert Ly · 15 years ago
  73. 1db9071 Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 15 years ago
  74. ebdce77 am e766fcd5: DOC CHANGE: Bug 3396898 add attribute uses-library by Joe Malin · 15 years ago
  75. 5b620a9 am 79a97489: (-s ours) am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. by Andreas Huber · 15 years ago
  76. 3851951 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. by Andreas Huber · 15 years ago
  77. 7a9d90d am 0643d7c4: docs: add new tag for tasks doc by Scott Main · 15 years ago
  78. e9b1ce3 am b1835085: Merge "@hide DPM global proxy settings" into honeycomb by Andy Stadler · 15 years ago
  79. b81ccee Merge "@hide DPM global proxy settings" into honeycomb by Andy Stadler · 15 years ago
  80. 82170c4 resolved conflicts for merge of f722cecd to honeycomb-plus-aosp by Scott Main · 15 years ago
  81. ea66537 Merge "docs: update homepage for 3.0 announcement" into honeycomb by Scott Main · 15 years ago
  82. 944d50d am de27b519: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread by Robert Greenwalt · 15 years ago
  83. c6ef3a4 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread by Robert Greenwalt · 15 years ago
  84. b9ce99c Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread by Robert Greenwalt · 15 years ago
  85. f6969a2 am 874ae43c: Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 15 years ago
  86. fd71a95 Merge "Import revised translations. DO NOT MERGE" into honeycomb by Eric Fischer · 15 years ago
  87. 47a95e6 am b79db4cd: (-s ours) am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread by Alon Albert · 15 years ago
  88. 92b31b9 am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread by Alon Albert · 15 years ago
  89. 397de75 am 796ce77a: docs: add breadcrumbs to articles and tutorials by Scott Main · 15 years ago
  90. b088416 Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread by Alon Albert · 15 years ago
  91. 7750440 am 99e267eb: am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation by daniel_tomas · 15 years ago
  92. 380b267 am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation by daniel_tomas · 15 years ago
  93. f361eda am 8c8e9d9a: am 1df862a4: Minor doc update. by Nick Pelly · 15 years ago
  94. a112a94 am 1df862a4: Minor doc update. by Nick Pelly · 15 years ago
  95. 07bff22 am f79bbc30: Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb by Scott Main · 15 years ago
  96. dd0630c am 16d94f58: (-s ours) am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread by Andreas Huber · 15 years ago
  97. 89ddb29 Merge "docs: edit doc titles to match side nav and add breadcrumb links" into honeycomb by Scott Main · 15 years ago
  98. d145fc1 am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread by Andreas Huber · 15 years ago
  99. 071969e Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread by Andreas Huber · 15 years ago
  100. 6443e1a am c3ebf27a: am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread by Robert Ly · 15 years ago