Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / libcore / c237e0549138d7884e6c99422f2ae7533f191a88
  1. c237e05 Merge the 2018-05-05 SPL branch from AOSP-Partner into int/n/fp2 by Borjan Tchakaloff · 6 years ago
  2. 9731845 Merge tag 'LA.UM.5.8.r1-02900-8x98.0' into android-7.1.2_r36 by Andrew Appleby · 6 years ago
  3. f3423a7 Merge cherrypicks of [2973982, 2974657, 2974658, 2973983, 2973984, 2974689, 2974690, 2974691, 2974692, 2974710, 2974711, 2974713, 2974714, 2974215, 2974216, 2974217, 2974218, 2974219, 2974220, 2974729, 2974730, 2974731, 2974732, 2974733, 2974734, 2974735, 2974736, 2974737, 2974738, 2974739, 2974740, 2974741, 2974742, 2974749, 2974750, 2974751, 2974752, 2974753, 2974647, 2974744, 2974693, 2974694, 2974648, 2974513, 2974665, 2974746] into nyc-mr2-release by android-build-team Robot · 7 years ago
  4. dfc5222 Fix failing FileTest#test_canonicalCachesAreOff() by Przemyslaw Szczepaniak · 7 years ago
  5. 546474f Disable File.getCanonicalPath caches. by Przemyslaw Szczepaniak · 7 years ago
  6. f96428a Fix failing FileTest#test_canonicalCachesAreOff() by Przemyslaw Szczepaniak · 7 years ago
  7. 97954f2 Disable File.getCanonicalPath caches. by Przemyslaw Szczepaniak · 7 years ago
  8. 02770e0 Merge daaeeceb9871d8723d3630ed6289e1866187a321 on remote branch by Linux Build Service Account · 7 years ago
  9. daaeece Promotion of android-framework.lnx.2.0-00107. by Linux Build Service Account · 7 years ago
  10. 17cf916 Proper fix for rejecting ftp URL with /r/n. by Przemyslaw Szczepaniak · 7 years ago
  11. 7dde46c Test for rejection of ftp URL with /r/n in userinfo by Przemyslaw Szczepaniak · 7 years ago
  12. 0a38f1a Merge cherrypicks of [2310196, 2310339, 2310340, 2310175, 2310320, 2310321, 2310322, 2310323, 2310217, 2310311, 2310349, 2310313, 2310331, 2310314, 2310286, 2310368, 2310383, 2310272, 2310439, 2310317, 2310318, 2310370, 2310352, 2310459, 2310287, 2310384, 2310237, 2310422, 2310440, 2310372, 2310289, 2310374, 2310355, 2310461, 2310423, 2310375, 2310376, 2310385, 2310386, 2310275, 2310462, 2310442, 2310443, 2310539, 2310378, 2310445, 2310238, 2310446, 2310540, 2310335, 2310582, 2310454, 2310659, 2310392, 2310393, 2310437, 2310679, 2310626] into nyc-mr2-release by android-build-team Robot · 7 years ago
  13. c5dd90d Proper fix for rejecting ftp URL with /r/n. by Przemyslaw Szczepaniak · 7 years ago
  14. 9456600 Test for rejection of ftp URL with /r/n in userinfo by Przemyslaw Szczepaniak · 7 years ago
  15. 2a1816e Proper fix for rejecting ftp URL with /r/n. by Przemyslaw Szczepaniak · 7 years ago
  16. 1f56d42 Revert "Reject ftp URLConnection containing /r/n in user info." by Przemyslaw Szczepaniak · 7 years ago
  17. f7dd776 Merge 74c9955cac5c845687a5ca5a9fe5da4b5ffee556 on remote branch by Linux Build Service Account · 7 years ago
  18. 6e2afe5 Merge "Reject ftp URLConnection containing /r/n in user info." into security-aosp-nyc-mr2-release by JP Sugarbroad · 7 years ago
  19. 2757235 Reject ftp URLConnection containing /r/n in user info. by Przemyslaw Szczepaniak · 7 years ago
  20. 3305ffb Test for rejection of ftp URL with /r/n in userinfo by Przemyslaw Szczepaniak · 7 years ago
  21. 74c9955 Promotion of android-framework.lnx.2.0-00076. by Linux Build Service Account · 7 years ago
  22. f36e49c N-MR2 N2G47H merge 'e0874054acea0e164c4464d3bb82302df50e8e5c' - conflicts by Lalit Kansara · 7 years ago
  23. cdf86a7 Promotion of android-framework.lnx.2.0-00057. by Linux Build Service Account · 7 years ago
  24. 8a100b4 N-MR1 NMF26X merge '4b3f2c6c5b84f80fae8eeeb46727811e055715ea' - Clean by Lalit Kansara · 7 years ago
  25. e087405 Fix URLTest#testAtSignInUserInfo failure am: 7e6977749c am: 47ee0f9e11 am: d24900bf47 by Yi Kong · 7 years ago
  26. 51fb3c6 Pull upstream fix for CVE-2016-5552 am: 7247f6a70e am: 7013de23a1 am: 0398dec2b9 by Yi Kong · 7 years ago
  27. aba0708 Fix URLTest#testAtSignInUserInfo failure am: 7e6977749c am: 47ee0f9e11 by Yi Kong · 7 years ago
  28. cb3d605 Pull upstream fix for CVE-2016-5552 am: 7247f6a70e am: 7013de23a1 am: 0398dec2b9 by Yi Kong · 7 years ago
  29. d24900b Fix URLTest#testAtSignInUserInfo failure am: 7e6977749c am: 47ee0f9e11 by Yi Kong · 7 years ago
  30. 0398dec Pull upstream fix for CVE-2016-5552 am: 7247f6a70e am: 7013de23a1 by Yi Kong · 7 years ago
  31. 47ee0f9 Fix URLTest#testAtSignInUserInfo failure am: 7e6977749c by Yi Kong · 7 years ago
  32. 7013de2 Pull upstream fix for CVE-2016-5552 am: 7247f6a70e by Yi Kong · 7 years ago
  33. 7e69777 Fix URLTest#testAtSignInUserInfo failure by Yi Kong · 7 years ago
  34. 5b5500e Promotion of android-framework.lnx.2.0-00054. by Linux Build Service Account · 7 years ago
  35. 7247f6a Pull upstream fix for CVE-2016-5552 by Yi Kong · 7 years ago
  36. b96136b Fix URL parser may return wrong host name by Yi Kong · 8 years ago
  37. bc91919 Merge "Re-add tz code that was lost in java.lang.System" into nyc-mr2-dev by Neil Fuller · 7 years ago
  38. 218158d Re-add tz code that was lost in java.lang.System by Neil Fuller · 7 years ago
  39. 6b346c6 Merge "Test fix: Handle missing dummy0 network interface" into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  40. c8c60eb Test fix: Handle missing dummy0 network interface by Neil Fuller · 7 years ago
  41. 0c59228 Merge "Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev am: 510a2eff8f am: b43e88bc80 by Xin Li · 7 years ago
  42. 89bbaaa Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev. am: 040684499e am: b327e42e0f by Xin Li · 7 years ago
  43. 7e924d4 Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 1c26d74db1 am: 9c8f9bbfa9 by Xin Li · 7 years ago
  44. b3b9ab3 resolve merge conflicts of 7a70344e1e to nyc-mr1-dev am: 50e9446e61 by Xin Li · 7 years ago
  45. 9f8d1b9 Merge "Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev am: 510a2eff8f by Xin Li · 7 years ago
  46. 8ecb443 Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev. am: 040684499e by Xin Li · 7 years ago
  47. 4e024b5 Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 1c26d74db1 by Xin Li · 7 years ago
  48. b4d35a9 resolve merge conflicts of 7a70344e1e to nyc-mr1-dev am: 50e9446e61 by Xin Li · 7 years ago
  49. b43e88b Merge "Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev by Xin Li · 7 years ago
  50. b327e42 Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev. by Xin Li · 7 years ago
  51. 9c8f9bb Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev by Xin Li · 7 years ago
  52. 510a2ef Merge "Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev by Treehugger Robot · 7 years ago
  53. 50e9446 resolve merge conflicts of 7a70344e1e to nyc-mr1-dev by Xin Li · 7 years ago
  54. 0406844 Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev. by Xin Li · 7 years ago
  55. 1c26d74 Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev by Treehugger Robot · 7 years ago
  56. 7a70344 Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev by Xin Li · 7 years ago
  57. 53c8c68 Document incorrect LinkedHashMap Spliterator ordering in Android N. by Tobias Thierer · 7 years ago
  58. 5ba882b Merge "Fix ByteBuffer.put(ByteBuffer) edge case." into nyc-mr2-dev by Przemyslaw Szczepaniak · 7 years ago
  59. b62ed4c recvfrom should set srcAddress for empty packets by Yi Kong · 7 years ago
  60. 2f026b4 Fix ByteBuffer.put(ByteBuffer) edge case. by Przemyslaw Szczepaniak · 7 years ago
  61. 2536f92 DO NOT MERGE: Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which was lost as a result of merge b70b7f8235ef38575467b6bb702be29e9d1024c7: am: 8689fc01ee by Xin Li · 7 years ago
  62. 16d6924 DO NOT MERGE: Cherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which was lost as a result of merge b70b7f8235ef38575467b6bb702be29e9d1024c7: by Xin Li · 7 years ago
  63. 8689fc0 DO NOT MERGE: Cherry-pick the following missing commits from nyc-mr1-dev by Xin Li · 7 years ago
  64. 57e73ef Don't run Annotations57649Test on low-ram devices. by Nimrod Gileadi · 8 years ago
  65. c18a1e5 Do not run test requiring 3GB free space on devices that do not have it by Erik Wolsheimer · 8 years ago
  66. 9cd8345 DO NOT MERGE: Merge in history of stage-aosp-nyc-mr1-cts-dev into nyc-mr1-dev with -s ours. am: 672ac17930 by Xin Li · 7 years ago
  67. 1d5cad7 DO NOT MERGE: Merge in history of stage-aosp-nyc-mr1-cts-dev into nyc-mr1-dev with -s ours. by Xin Li · 7 years ago
  68. 672ac17 DO NOT MERGE: Merge in history of stage-aosp-nyc-mr1-cts-dev into by Xin Li · 7 years ago
  69. f26dd88 DO NOT MERGE: CertificateTest: explicitly set validity check date by Kenny Root · 8 years ago
  70. a10a1b8 Promotion of android-framework.lnx.2.0-00024. by Linux Build Service Account · 7 years ago
  71. 4b3f2c6 Fix URL parser may return wrong host name by Yi Kong · 8 years ago
  72. 967edcc CertificateTest: explicitly set validity check date am: 06673ab230 am: b70b7f8235 by Kenny Root · 7 years ago
  73. 7d98c31 merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: f1bdb7f572 am: 8195b77c68 by Kenny Root · 7 years ago
  74. f649cc9 merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 3c8471a841 am: 913dda0b38 by Narayan Kamath · 7 years ago
  75. 55b729c CertificateTest: explicitly set validity check date am: 06673ab230 by Kenny Root · 7 years ago
  76. f758df9 merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: f1bdb7f572 by Kenny Root · 7 years ago
  77. ddceb1a merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 3c8471a841 by Narayan Kamath · 7 years ago
  78. b70b7f8 CertificateTest: explicitly set validity check date am: 06673ab230 by Kenny Root · 7 years ago
  79. 8195b77 merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: f1bdb7f572 by Kenny Root · 7 years ago
  80. 913dda0 merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 3c8471a841 by Narayan Kamath · 7 years ago
  81. d3f91b1 Back_Merge_N_MR1_To_Dev by Abhilash Kumar Subhash · 7 years ago
  82. 2efdf13 Merge "Fix Formatter.format("%,d") for locales without grouping" into nyc-mr2-dev by Neil Fuller · 7 years ago
  83. 558e9c5 Fix Formatter.format("%,d") for locales without grouping by Neil Fuller · 7 years ago
  84. 06673ab CertificateTest: explicitly set validity check date by Kenny Root · 8 years ago
  85. a742ea1 Merge commit '3c8471a841747a76d2db00283588bd9bb8508bd2' into remote by Lalit Kansara · 7 years ago
  86. a7e6bc7 Merge "Fix URL parser may return wrong host name" into nyc-dev am: 7654a2ae01 am: 3ad63f44b3 am: 03fe0acc9a by Yi Kong · 7 years ago
  87. ae61451 Fix URL parser may return wrong host name am: f98287d575 am: 7176631892 am: aae5ed25ac by Yi Kong · 7 years ago
  88. e73eb6f Merge "Fix URL parser may return wrong host name" into nyc-dev am: 7654a2ae01 am: 3ad63f44b3 by Yi Kong · 7 years ago
  89. 82ef5ed Fix URL parser may return wrong host name am: f98287d575 am: 7176631892 by Yi Kong · 7 years ago
  90. 03fe0ac Merge "Fix URL parser may return wrong host name" into nyc-dev am: 7654a2ae01 by Yi Kong · 7 years ago
  91. aae5ed2 Fix URL parser may return wrong host name am: f98287d575 am: 7176631892 by Yi Kong · 7 years ago
  92. 3ad63f4 Merge "Fix URL parser may return wrong host name" into nyc-dev am: 7654a2ae01 by Yi Kong · 7 years ago
  93. 7176631 Fix URL parser may return wrong host name am: f98287d575 by Yi Kong · 7 years ago
  94. 7654a2a Merge "Fix URL parser may return wrong host name" into nyc-dev by Yi Kong · 7 years ago
  95. 3ed8687 Fix ordering issue in view ByteBuffer by Shubham Ajmera · 8 years ago
  96. ce45dbe Merge "Delete DexFile closeguard" by Linux Build Service Account · 7 years ago
  97. f1bdb7f merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev by gitbuildkicker · 8 years ago
  98. 1ad00dd Promotion of android-framework.lnx.2.0-00021. by Linux Build Service Account · 8 years ago
  99. 9510113 Merge "Merge "DO NOT MERGE Relax N CTS about whether \t is allowed in header values" into nougat-cts-dev am: 9f37302e67 -s ours am: 39284c58e3 am: 19a0ec92a0 am: b6bc759250" into cw-f-dev by Tina Zhou · 8 years ago
  100. 39f81db Merge "DO NOT MERGE Relax N CTS about whether \t is allowed in header values" into nougat-cts-dev am: 9f37302e67 -s ours am: 39284c58e3 am: 19a0ec92a0 am: b6bc759250 by Tina Zhou · 8 years ago