Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d
  1. be2ed6d resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp by repo sync · 14 years ago
  2. 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
  3. 22577b8 am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 14 years ago
  4. 5ff79c3 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 14 years ago
  5. 9248e95 DO NOT MERGE Cherry-pick of Ie4026a7c back to GB by Dianne Hackborn · 15 years ago
  6. 9add122 DO NOT MERGE - Increasing timeout to 60 sec by Alon Albert · 14 years ago
  7. 76d0c76 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 14 years ago
  8. fa238f0 Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 14 years ago
  9. da34ab2 am 9208875e: Updated iconography for network status and adding 4G assets by Justin Ho · 14 years ago
  10. 1aba843d am ccc802e1: Merge "Support quoted parameters" into gingerbread by Alon Albert · 14 years ago
  11. c0775a2 egl: fixes for object refcounts by Michael I. Gold · 15 years ago
  12. 9208875 Updated iconography for network status and adding 4G assets by Justin Ho · 14 years ago
  13. ccc802e Merge "Support quoted parameters" into gingerbread by Alon Albert · 14 years ago
  14. 62f40c8 am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 14 years ago
  15. 06912bd Support quoted parameters by Alon Albert · 14 years ago
  16. ad49216 am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 14 years ago
  17. a2090be am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 14 years ago
  18. 7118bde Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 14 years ago
  19. 58e3822 Fix for #12945: ProgressBar.setMax() will always redraw. by Michael Krehan · 14 years ago
  20. 99cca89 Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 14 years ago
  21. 79a9748 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. by Andreas Huber · 14 years ago
  22. dbe09da DO NOT MERGE: Respond to RTSP server->client requests. by Andreas Huber · 14 years ago
  23. de27b51 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread by Robert Greenwalt · 14 years ago
  24. 3259d88 Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread by Robert Greenwalt · 14 years ago
  25. b79db4c am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread by Alon Albert · 14 years ago
  26. be5f82a Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread by Alon Albert · 14 years ago
  27. c441e4e DO NOT MERGE - Clear backoffs on reconnect by Alon Albert · 14 years ago
  28. 99e267e am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation by daniel_tomas · 14 years ago
  29. 7bcd2c6 New API added in NfcAdapter to enable/disable SE card emulation by daniel_tomas · 15 years ago
  30. 8c8e9d9 am 1df862a4: Minor doc update. by Nick Pelly · 14 years ago
  31. 1df862a Minor doc update. by Nick Pelly · 14 years ago
  32. 16d94f5 am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread by Andreas Huber · 14 years ago
  33. 8db7a7b Merge "DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary" into gingerbread by Andreas Huber · 14 years ago
  34. c3ebf27 am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread by Robert Ly · 14 years ago
  35. 4bebbe5 Merge "Adding package summary for nfc.tech package" into gingerbread by Robert Ly · 14 years ago
  36. 2deeefe Adding package summary for nfc.tech package by Robert Ly · 14 years ago
  37. ea47cb4 DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary by Andreas Huber · 14 years ago
  38. 39014026 am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread by John Wang · 14 years ago
  39. 29853a3 Merge "Only decode EXT1 tag when it is available." into gingerbread by John Wang · 14 years ago
  40. e0c9f27 am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers. by Andreas Huber · 14 years ago
  41. d1ba051 DO NOT MERGE: Work around several issues with non-compliant RTSP servers. by Andreas Huber · 14 years ago
  42. c2cbc73 Only decode EXT1 tag when it is available. by John Wang · 14 years ago
  43. 3537011 Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  44. b269346 am d4952380: fix md5sum for windows installer by Scott Main · 14 years ago
  45. d495238 fix md5sum for windows installer by Scott Main · 14 years ago
  46. 7e62fd1 DO NOT MERGE - backport of l92a02b31 from master by Robert Greenwalt · 14 years ago
  47. 810c1c0 am 322891c6: Doc change: nfc dev guide by Robert Ly · 14 years ago
  48. 6d104f1 am 6901f963: am 93552de8: Merge "stubs" by Jean-Baptiste Queru · 14 years ago
  49. 6901f96 am 93552de8: Merge "stubs" by Jean-Baptiste Queru · 14 years ago
  50. 93552de Merge "stubs" by Jean-Baptiste Queru · 14 years ago
  51. 1da9706 stubs by Steve Block · 14 years ago
  52. 322891c Doc change: nfc dev guide by Robert Ly · 14 years ago
  53. 8e28ab22 am 2050de5b: Text selection is broken. by Gilles Debunne · 14 years ago
  54. 2050de5 Text selection is broken. by Gilles Debunne · 14 years ago
  55. bdce3d2 am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" by Wink Saville · 14 years ago
  56. 01a5eba am 6e25789f: Merge "Telephony: Fix cb sms implementation" by Wink Saville · 14 years ago
  57. 6e25789 Merge "Telephony: Fix cb sms implementation" by Wink Saville · 14 years ago
  58. d0f27f4 am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread by Mathias Agopian · 14 years ago
  59. ada1b6f Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread by Mathias Agopian · 14 years ago
  60. b605869 am 07cefd3c: add 2.3.3 announcement to site home page by Scott Main · 14 years ago
  61. 07cefd3 add 2.3.3 announcement to site home page by Scott Main · 14 years ago
  62. c1cc9ba am 58c9d472: Merge "More documentation updates for NFC." into gingerbread by Jeff Hamilton · 14 years ago
  63. 58c9d47 Merge "More documentation updates for NFC." into gingerbread by Jeff Hamilton · 14 years ago
  64. 28319c0 More documentation updates for NFC. by Jeff Hamilton · 14 years ago
  65. 8d56f6de am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread by Dirk Dougherty · 14 years ago
  66. 47dac54 am 39cf3a44: Document NFC permissions. by Nick Pelly · 14 years ago
  67. a3f53af Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread by Dirk Dougherty · 14 years ago
  68. 39cf3a4 Document NFC permissions. by Nick Pelly · 14 years ago
  69. 237a344 Doc change: Add version notes for Android 2.3.3. by Dirk Dougherty · 14 years ago
  70. 1ac3541 am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread by Jeff Hamilton · 14 years ago
  71. 584afa8 Merge "Improve the docs a bit for foreground dispatch." into gingerbread by Jeff Hamilton · 14 years ago
  72. 167d9e4 Improve the docs a bit for foreground dispatch. by Jeff Hamilton · 14 years ago
  73. c1c3143 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 14 years ago
  74. 129c737 am 3c01a139: rename SIP doc title by Scott Main · 14 years ago
  75. 42f1819 am c442bc60: docs: move the SIP guide into guide/network/ by Scott Main · 14 years ago
  76. 690d31a am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API by Katie McCormick · 14 years ago
  77. be04bfd am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread by Dirk Dougherty · 14 years ago
  78. 63bd55c am cdfe8999: Fix for multiple merge problem. by Gilles Debunne · 14 years ago
  79. f7de51c Telephony: Fix cb sms implementation by Alex Yakavenka · 14 years ago
  80. e04c149 resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp by Gilles Debunne · 14 years ago
  81. be4b39d Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 14 years ago
  82. 3c01a13 rename SIP doc title by Scott Main · 14 years ago
  83. c442bc6 docs: move the SIP guide into guide/network/ by Scott Main · 14 years ago
  84. 7134520 cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 by Katie McCormick · 15 years ago
  85. 01967c0e Merge "Doc change: Add diff report for api 10." into gingerbread by Dirk Dougherty · 14 years ago
  86. dff2fea Import revised translations. DO NOT MERGE by Eric Fischer · 14 years ago
  87. a62bf8b am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" by Brad Fitzpatrick · 14 years ago
  88. b901c9a am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" by Brad Fitzpatrick · 14 years ago
  89. 9204644 Merge "Fix a race condition in NativeDaemonConnector" by Brad Fitzpatrick · 14 years ago
  90. 030bc88 Fix a race condition in NativeDaemonConnector by anga · 15 years ago
  91. 6b497a0 am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition." by Dianne Hackborn · 14 years ago
  92. 4b7c1ca am bb2e1ef8: Merge "Fixing possible race condition." by Dianne Hackborn · 14 years ago
  93. bb2e1ef Merge "Fixing possible race condition." by Dianne Hackborn · 15 years ago
  94. cdfe899 Fix for multiple merge problem. by Gilles Debunne · 15 years ago
  95. c4dfa99 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." by Kenny Root · 15 years ago
  96. d2a9961 am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." by Kenny Root · 15 years ago
  97. 1ba2a47 am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  98. 826fbdf am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  99. c0728cc Double tap triggers text selection in a TextView. DO NOT MERGE by Gilles Debunne · 15 years ago
  100. 2f7e9d4 am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago