Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / c40687f85a400da608ee5a2f55a66efd40560914
  1. c40687f Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 7 years ago
  2. 7d9588c Merge "Migrate most of core networking tests to junit4" am: 9d456cd9c6 by Hugo Benichi · 7 years ago
  3. 9d456cd Merge "Migrate most of core networking tests to junit4" by Treehugger Robot · 7 years ago
  4. 4a0c5d7 Migrate most of core networking tests to junit4 by Hugo Benichi · 7 years ago
  5. e95023f Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 7 years ago
  6. 1c36619 Merge "Fix URI unparceling and clarify an error condition" am: 5f123e6ad6 by Hall Liu · 7 years ago
  7. 065dc70 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours am: bbcb8e4976 by Jeff Sharkey · 7 years ago
  8. 5f123e6 Merge "Fix URI unparceling and clarify an error condition" by Hall Liu · 7 years ago
  9. 1b1ea96 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours am: 620c5cfda0 by Jeff Sharkey · 7 years ago
  10. 753a9ab DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa am: d6e3d358d4 -s ours by Jeff Sharkey · 7 years ago
  11. 014d73e Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971 by Brad Ebinger · 7 years ago
  12. e286f08 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 am: af93051ac4 -s ours by Jeff Sharkey · 7 years ago
  13. bbcb8e4 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 am: 92d80b72aa by Jeff Sharkey · 7 years ago
  14. d6e3d35 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb am: f1f2a61fb7 by Jeff Sharkey · 7 years ago
  15. 946ff79 Merge "Add new Download Error Codes" am: e9bd5449b5 by Brad Ebinger · 7 years ago
  16. 620c5cf DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 am: 44adace6c6 by Jeff Sharkey · 7 years ago
  17. 6ef8866 Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp by Android Build Merger (Role) · 7 years ago
  18. af93051 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 am: 7512875224 by Jeff Sharkey · 7 years ago
  19. e9bd544 Merge "Add new Download Error Codes" by Brad Ebinger · 7 years ago
  20. 92d80b7 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 am: 300e6ffafb by Jeff Sharkey · 7 years ago
  21. a54bfed Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf by Jeff Sharkey · 7 years ago
  22. e9aaf3c Merge "Add missing includes." am: 4be4bb3db7 am: 41c08f49b4 by Dan Albert · 7 years ago
  23. 44adace DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 am: 8860624853 by Jeff Sharkey · 7 years ago
  24. 41c08f4 Merge "Add missing includes." am: 4be4bb3db7 by Dan Albert · 7 years ago
  25. a7f0504 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours by Jeff Sharkey · 7 years ago
  26. f1f2a61 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours am: ba1f2d2571 by Jeff Sharkey · 7 years ago
  27. 7512875 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours am: e9d2113af7 by Jeff Sharkey · 7 years ago
  28. 4be4bb3 Merge "Add missing includes." by Treehugger Robot · 7 years ago
  29. 0de1d85 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 by Jeff Sharkey · 7 years ago
  30. 300e6ff DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 am: 8916c30c54 -s ours by Jeff Sharkey · 7 years ago
  31. 3b47256 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a by Jeff Sharkey · 7 years ago
  32. 97f6a0d Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c by Jeff Sharkey · 7 years ago
  33. 8860624 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921 -s ours by Jeff Sharkey · 7 years ago
  34. ba1f2d2 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c am: 5d60a49d63 by Jeff Sharkey · 7 years ago
  35. 8bfef31 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 by Jeff Sharkey · 7 years ago
  36. 4a71a2d Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours by Jeff Sharkey · 7 years ago
  37. da3d105 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 by Jeff Sharkey · 7 years ago
  38. e6f60d0 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 by Jeff Sharkey · 7 years ago
  39. 7f108b8 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 by Jeff Sharkey · 7 years ago
  40. e9d2113 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee by Jeff Sharkey · 7 years ago
  41. 8916c30 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 am: 7555eb508c by Jeff Sharkey · 7 years ago
  42. 3f671b3 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev by Jeff Sharkey · 7 years ago
  43. 72df970 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a by Jeff Sharkey · 7 years ago
  44. e1ae848 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c by Jeff Sharkey · 7 years ago
  45. 98371ee Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours by Jeff Sharkey · 7 years ago
  46. e62d479 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 by Jeff Sharkey · 7 years ago
  47. 5d60a49 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 by Jeff Sharkey · 7 years ago
  48. b4d23d5 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev by Jeff Sharkey · 7 years ago
  49. 4a60106 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev by Jeff Sharkey · 7 years ago
  50. 31c5adc Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev by TreeHugger Robot · 7 years ago
  51. d20cad6 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 by Jeff Sharkey · 7 years ago
  52. 7555eb5 DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9 by Jeff Sharkey · 7 years ago
  53. 5f17a28 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev by Jeff Sharkey · 7 years ago
  54. 0998421 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev by TreeHugger Robot · 7 years ago
  55. 9d37060 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev by TreeHugger Robot · 7 years ago
  56. 2543699 Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev by TreeHugger Robot · 7 years ago
  57. 311fa22 Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours by Bill Yi · 7 years ago
  58. 1018a5d Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours by Bill Yi · 7 years ago
  59. e721fbd Merge "Import translations. DO NOT MERGE" into oc-dev by TreeHugger Robot · 7 years ago
  60. c59fcd8 Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours am: fcde0eda85 -s ours by Bill Yi · 7 years ago
  61. 110e007 Add missing includes. by Dan Albert · 7 years ago
  62. bb04ab9 Import translations. DO NOT MERGE am: 757057a5b5 -s ours am: 6fd592553c -s ours by Bill Yi · 7 years ago
  63. fcde0ed Import translations. DO NOT MERGE am: 757057a5b5 -s ours by Bill Yi · 7 years ago
  64. 6fd5925 Import translations. DO NOT MERGE am: 757057a5b5 -s ours by Bill Yi · 7 years ago
  65. 1adda8b Merge "Convert libjnigraphics to Android.bp" am: 006c167544 am: 2fbccabbca by Colin Cross · 7 years ago
  66. 2fbccab Merge "Convert libjnigraphics to Android.bp" am: 006c167544 by Colin Cross · 7 years ago
  67. 006c167 Merge "Convert libjnigraphics to Android.bp" by Colin Cross · 7 years ago
  68. 8d6a7d9 Merge "Add MM#6 string overlay" am: b53262c148 am: 939db64461 by Jordan Liu · 7 years ago
  69. 939db64 Merge "Add MM#6 string overlay" am: b53262c148 by Jordan Liu · 7 years ago
  70. b53262c Merge "Add MM#6 string overlay" by Jordan Liu · 7 years ago
  71. 6f42d69 Merge "EventLogHelper: Clean up code" am: 386a5687dd am: 9b24969314 by Andreas Gampe · 7 years ago
  72. 9b24969 Merge "EventLogHelper: Clean up code" am: 386a5687dd by Andreas Gampe · 7 years ago
  73. 386a568 Merge "EventLogHelper: Clean up code" by Treehugger Robot · 7 years ago
  74. 0f77962 Merge "IpManager: add display name for helpful logging, and Network" am: ed0b030e17 by Erik Kline · 7 years ago
  75. d0c68de Merge "IpManager: add display name for helpful logging, and Network" by Erik Kline · 7 years ago
  76. ed0b030 Merge "IpManager: add display name for helpful logging, and Network" by Treehugger Robot · 7 years ago
  77. e42502d IpManager: add display name for helpful logging, and Network by Erik Kline · 7 years ago
  78. 3038ca8 Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  79. 47806be Merge "Log upstream network suspend/resume callbacks" am: 645cd2ad26 by Erik Kline · 7 years ago
  80. cc92587 Merge "Log upstream network suspend/resume callbacks" am: 645cd2ad26 by Erik Kline · 7 years ago
  81. 645cd2a Merge "Log upstream network suspend/resume callbacks" by Treehugger Robot · 7 years ago
  82. 126171b Log upstream network suspend/resume callbacks by Erik Kline · 7 years ago
  83. a094510 Fix URI unparceling and clarify an error condition by Hall Liu · 7 years ago
  84. 757057a Import translations. DO NOT MERGE by Bill Yi · 7 years ago
  85. 0db4c36 Merge "LoggingPrintStream: Make visible for testing" am: 7d1789867b by Andreas Gampe · 7 years ago
  86. dcb8cf8 Merge "LoggingPrintStream: Make visible for testing" am: 7d1789867b by Andreas Gampe · 7 years ago
  87. 7d17898 Merge "LoggingPrintStream: Make visible for testing" by Treehugger Robot · 7 years ago
  88. 6fb5072 Add new Download Error Codes by Brad Ebinger · 7 years ago
  89. 8765abc Merge "Require DownloadRequest#Builder to have mandatory Source URI" am: 432c2b0fb9 by Brad Ebinger · 7 years ago
  90. 3b6df53 Merge "Require DownloadRequest#Builder to have mandatory Source URI" by Brad Ebinger · 7 years ago
  91. 432c2b0 Merge "Require DownloadRequest#Builder to have mandatory Source URI" by Brad Ebinger · 7 years ago
  92. 7934a7f Merge "Parcel: Avoid NPE in finalization" am: b085deece9 am: cb34bdf55c by Andreas Gampe · 7 years ago
  93. cb34bdf Merge "Parcel: Avoid NPE in finalization" am: b085deece9 by Andreas Gampe · 7 years ago
  94. b085dee Merge "Parcel: Avoid NPE in finalization" by Treehugger Robot · 7 years ago
  95. 3345974 EventLogHelper: Clean up code by Andreas Gampe · 7 years ago
  96. 7f49276 Merge "{Event,Security}Log: Unify code" am: 0c614c7018 am: 812b09d6bd by Andreas Gampe · 7 years ago
  97. 812b09d Merge "{Event,Security}Log: Unify code" am: 0c614c7018 by Andreas Gampe · 7 years ago
  98. 0c614c7 Merge "{Event,Security}Log: Unify code" by Treehugger Robot · 7 years ago
  99. e2456d6 LoggingPrintStream: Make visible for testing by Andreas Gampe · 7 years ago
  100. 009b852 Parcel: Avoid NPE in finalization by Andreas Gampe · 7 years ago