Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_native / a79113be346ea0d64974b3c6ac84dfe823b96c63
  1. a79113b am 1175ef7e: Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread by Xavier Ducrohet · 15 years ago
  2. c806fe1 resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp by Xavier Ducrohet · 15 years ago
  3. be82ce2 Merge "LayoutLib: Adapt the HC layoutlib to GB. do not merge." into gingerbread by Xavier Ducrohet · 15 years ago
  4. e90a80a Merge "LayoutLib: Original import of Honeycomb's layoutlib. do not merge." into gingerbread by Xavier Ducrohet · 15 years ago
  5. 4923011 resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp by repo sync · 15 years ago
  6. 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
  7. 0b270d3 am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 15 years ago
  8. 9281fda Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread by Jason Chen · 15 years ago
  9. a5c7de6 am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 15 years ago
  10. 8a5d77b Merge "egl: fixes for object refcounts" into gingerbread by Jamie Gennis · 15 years ago
  11. 3c48c35 am 9208875e: Updated iconography for network status and adding 4G assets by Justin Ho · 15 years ago
  12. 9427552 am ccc802e1: Merge "Support quoted parameters" into gingerbread by Alon Albert · 15 years ago
  13. 3e52713 egl: fixes for object refcounts by Michael I. Gold · 15 years ago
  14. 61d36d7 Merge "Support quoted parameters" into gingerbread by Alon Albert · 15 years ago
  15. b36b9f3 am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 15 years ago
  16. 8ca2b0d am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 15 years ago
  17. d4cd30c am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 15 years ago
  18. 2151cef Merge "Fix for #12945: ProgressBar.setMax() will always redraw." by Romain Guy · 15 years ago
  19. 1db9071 Merge "Import revised translations. DO NOT MERGE" into gingerbread by Maarten Hooft · 15 years ago
  20. 3851951 am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests. by Andreas Huber · 15 years ago
  21. c6ef3a4 am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread by Robert Greenwalt · 15 years ago
  22. b9ce99c Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread by Robert Greenwalt · 15 years ago
  23. 92b31b9 am be5f82ab: Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread by Alon Albert · 15 years ago
  24. b088416 Merge "DO NOT MERGE - Clear backoffs on reconnect" into gingerbread by Alon Albert · 15 years ago
  25. 380b267 am 7bcd2c62: New API added in NfcAdapter to enable/disable SE card emulation by daniel_tomas · 15 years ago
  26. a112a94 am 1df862a4: Minor doc update. by Nick Pelly · 15 years ago
  27. 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
  28. 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
  29. 3520ddc am 4bebbe5f: Merge "Adding package summary for nfc.tech package" into gingerbread by Robert Ly · 15 years ago
  30. 08f2087 Merge "Adding package summary for nfc.tech package" into gingerbread by Robert Ly · 15 years ago
  31. e85d8d6 am 29853a35: Merge "Only decode EXT1 tag when it is available." into gingerbread by John Wang · 15 years ago
  32. 6ac7359 Merge "Only decode EXT1 tag when it is available." into gingerbread by John Wang · 15 years ago
  33. 8114745 am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers. by Andreas Huber · 15 years ago
  34. 1f14e87 am d4952380: fix md5sum for windows installer by Scott Main · 15 years ago
  35. 6619488 am 322891c6: Doc change: nfc dev guide by Robert Ly · 15 years ago
  36. fd32f41 am 6901f963: am 93552de8: Merge "stubs" by Jean-Baptiste Queru · 15 years ago
  37. a240734 am 93552de8: Merge "stubs" by Jean-Baptiste Queru · 15 years ago
  38. 3edab5a Merge "stubs" by Jean-Baptiste Queru · 15 years ago
  39. 58c4033 stubs by Steve Block · 15 years ago
  40. 4dffae1 am 2050de5b: Text selection is broken. by Gilles Debunne · 15 years ago
  41. 614a618 am 01a5eba8: am 6e25789f: Merge "Telephony: Fix cb sms implementation" by Wink Saville · 15 years ago
  42. 76615d7 am 6e25789f: Merge "Telephony: Fix cb sms implementation" by Wink Saville · 15 years ago
  43. 0db20b9 Merge "Telephony: Fix cb sms implementation" by Wink Saville · 15 years ago
  44. 4ed86b8 am ada1b6f2: Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread by Mathias Agopian · 15 years ago
  45. 6cb8fc1 Merge "fix [3421350] Killing a game that uses the accelerometer renders the device unable to sleep" into gingerbread by Mathias Agopian · 15 years ago
  46. 3290414 am 07cefd3c: add 2.3.3 announcement to site home page by Scott Main · 15 years ago
  47. 1ce30b2 am 58c9d472: Merge "More documentation updates for NFC." into gingerbread by Jeff Hamilton · 15 years ago
  48. 0858b00 Merge "More documentation updates for NFC." into gingerbread by Jeff Hamilton · 15 years ago
  49. 714319b am a3f53afd: Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread by Dirk Dougherty · 15 years ago
  50. 3d7a394 am 39cf3a44: Document NFC permissions. by Nick Pelly · 15 years ago
  51. 6e0c56d Merge "Doc change: Add version notes for Android 2.3.3." into gingerbread by Dirk Dougherty · 15 years ago
  52. b9e98d8 am 584afa8d: Merge "Improve the docs a bit for foreground dispatch." into gingerbread by Jeff Hamilton · 15 years ago
  53. c9cda41 Merge "Improve the docs a bit for foreground dispatch." into gingerbread by Jeff Hamilton · 15 years ago
  54. b5c24f2 am be4b39d2: Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 15 years ago
  55. ace630d am 3c01a139: rename SIP doc title by Scott Main · 15 years ago
  56. a12ed5e am c442bc60: docs: move the SIP guide into guide/network/ by Scott Main · 15 years ago
  57. 5ffcfb8 am 7134520b: cherrypick Change-Id: I5b52c5d11e111a9dab2b08fd44a439ab4db04dd2 Doc change: Adding new docs for SIP API by Katie McCormick · 15 years ago
  58. 1e6e960 am 01967c0e: Merge "Doc change: Add diff report for api 10." into gingerbread by Dirk Dougherty · 15 years ago
  59. 2f630a5 am cdfe8999: Fix for multiple merge problem. by Gilles Debunne · 15 years ago
  60. a8b288d resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp by Gilles Debunne · 15 years ago
  61. 021223d Merge "Import revised translations. DO NOT MERGE" into gingerbread by Eric Fischer · 15 years ago
  62. 88902d0 Merge "Doc change: Add diff report for api 10." into gingerbread by Dirk Dougherty · 15 years ago
  63. a9bc4da am b901c9ab: am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" by Brad Fitzpatrick · 15 years ago
  64. 16cd26a am 9204644d: Merge "Fix a race condition in NativeDaemonConnector" by Brad Fitzpatrick · 15 years ago
  65. d9d2033 Merge "Fix a race condition in NativeDaemonConnector" by Brad Fitzpatrick · 15 years ago
  66. b68bef3 am 4b7c1cac: am bb2e1ef8: Merge "Fixing possible race condition." by Dianne Hackborn · 15 years ago
  67. 6de8529 am bb2e1ef8: Merge "Fixing possible race condition." by Dianne Hackborn · 15 years ago
  68. 8fb929b Merge "Fixing possible race condition." by Dianne Hackborn · 15 years ago
  69. 4cb99b4 am d2a99617: am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." by Kenny Root · 15 years ago
  70. 78bee48 am c94a9998: Merge "JPtextinput: Dont break emoji characters when cutting strings." by Kenny Root · 15 years ago
  71. 3716ff2 am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  72. 973a0c5 am 8a6ba494: Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  73. 86411d7 am 53841df2: Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  74. 35dc5f7 Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  75. 83d390f Merge "All runnable are stopped on detach. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  76. ae4c508 Merge "SelectAllOnFocus shows a higlighted text. DO NOT MERGE." into gingerbread by Gilles Debunne · 15 years ago
  77. 9766fb3 Merge "JPtextinput: Dont break emoji characters when cutting strings." by Kenny Root · 15 years ago
  78. 43b65d6 am f664d6f9: am b083d3b8: Merge "Initialize resampling buffer per track." by Brad Fitzpatrick · 15 years ago
  79. 77c244f am b083d3b8: Merge "Initialize resampling buffer per track." by Brad Fitzpatrick · 15 years ago
  80. ef22f46 Merge "Initialize resampling buffer per track." by Brad Fitzpatrick · 15 years ago
  81. 55547bc am 163c28b5: Merge "Managed dialogs should run on the same thread as their activity." into gingerbread by Joe Onorato · 15 years ago
  82. 51a2bdc Merge "Managed dialogs should run on the same thread as their activity." into gingerbread by Joe Onorato · 15 years ago
  83. 87731c6 am 40684946: Merge "Fix docs type that broke build." into gingerbread by Nick Pelly · 15 years ago
  84. 344ff4b Merge "Fix docs type that broke build." into gingerbread by Nick Pelly · 15 years ago
  85. 504d094 am 6dbdcd55: am db71bda6: Merge from gingerbread by Jean-Baptiste Queru · 15 years ago
  86. 996522b am 779f7410: Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread by Scott Main · 15 years ago
  87. 2dc7584 am 630ac8df: Merge "NFC documentation overhaul." into gingerbread by Nick Pelly · 15 years ago
  88. 71d2954 Merge "cherrypick Change-Id: I6053e6f20045b0ecba4b964f9bfb87c3241d3a91 update dashboard" into gingerbread by Scott Main · 15 years ago
  89. ca7167f am db71bda6: Merge from gingerbread by Jean-Baptiste Queru · 15 years ago
  90. eef4bf9 Merge "NFC documentation overhaul." into gingerbread by Nick Pelly · 15 years ago
  91. 26ad216 Merge from gingerbread by Jean-Baptiste Queru · 15 years ago
  92. 317c791 am 8444023f: Merge from open-source gingerbread by Jean-Baptiste Queru · 15 years ago
  93. c9b062e Merge from open-source gingerbread by Jean-Baptiste Queru · 15 years ago
  94. 81f8187 Merge "Fix the Multi-page SMS sending error to several receipents" into gingerbread by Jean-Baptiste Queru · 15 years ago
  95. 09a49fa am 375afcd5: am 4b8ad9ef: Merge from gingerbread by Jean-Baptiste Queru · 15 years ago
  96. 70ca70d am 4b8ad9ef: Merge from gingerbread by Jean-Baptiste Queru · 15 years ago
  97. 9a0255c Merge from gingerbread by Jean-Baptiste Queru · 15 years ago
  98. 3c988fc Merge ee4c17ee from gingerbread by Jean-Baptiste Queru · 15 years ago
  99. 60bcbd0 Merge from open-source gingerbread by Jean-Baptiste Queru · 15 years ago
  100. 05e90f0 Merge "Fix delivery report error with PENDING status in SMS" into gingerbread by Jean-Baptiste Queru · 15 years ago