Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / base / edeb0313b716064163b06adaa7d7c02b3c97ead9
  1. edeb031 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 am: 4f05f46f13 by Oscar Shu · 5 years ago
  2. 867daa7 Merge "Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 am: 4999ce080d" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  3. 011723e Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc am: 1b6d718387 by Tobias Thierer · 5 years ago
  4. cb7ebee Merge "Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe am: 23cdf1a48c" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  5. 66ee479 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe by Santos Cordon · 5 years ago
  6. 1ff9dc9 Merge "Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 am: 7a5ba3f59d" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  7. 6653f2b Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 am: 2b52914445 by Neil Fuller · 5 years ago
  8. 2da6de0 Merge "[automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours am: a8aa5abfa0 -s ours am skip reason: change_id I423ca6ebb328f49b170baae0da9b8409a6429fcb with SHA1 7086666dea is in history" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  9. 85f6ce6 [automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours am: 56ac6f1ee7 -s ours by Remi NGUYEN VAN · 5 years ago
  10. e6495d4 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  11. afe708f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours by Bill Yi · 5 years ago
  12. 2c91624 Merge "Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 am: 83392f441d" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  13. ea14786 Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev am: c5441b2894 by Adrian Salido · 5 years ago
  14. 9607b94 Merge "Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours am: 594180c68c -s ours am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  15. 8602e0f Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am: 68770715e3 -s ours by Yi Kong · 5 years ago
  16. cfb337a [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 -s ours by Lucas Dupin · 5 years ago
  17. c40d399 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours by Bill Yi · 5 years ago
  18. 90fd03e Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff by Long Ling · 5 years ago
  19. 74ee0f2 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 -s ours by Long Ling · 5 years ago
  20. cacba7e DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager am: 66e9298ac6 by Long Ling · 5 years ago
  21. f650335 Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp am: 73c6f3caa3 by Sasha Smundak · 5 years ago
  22. 5b14cee Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2 am: 975bd46c43 by Yi Kong · 5 years ago
  23. a4c4948 Disable modernize-use-trailing-return-type clang-tidy check am: a0914d81ef by Yi Kong · 5 years ago
  24. bf069a4 Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev by Roman Kiryanov · 5 years ago
  25. 919efca Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev am: b55bf00418 by Pengquan Meng · 5 years ago
  26. 0c859fa resolve merge conflicts of 94c54dcee6a9728d63cef63c215d3ebd2de83831 to qt-r1-dev-plus-aosp by Inseob Kim · 5 years ago
  27. 23cdf1a Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev by Santos Cordon · 5 years ago
  28. 56b04b1 [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev by Lucas Dupin · 5 years ago
  29. 5c56a5e [automerger skipped] Import translations. DO NOT MERGE by Bill Yi · 5 years ago
  30. 6060198 Merge changes from topic "device_config_for_display_90" into qt-r1-dev by Long Ling · 5 years ago
  31. 318adae [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager by Long Ling · 5 years ago
  32. 8da4630 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager by Long Ling · 5 years ago
  33. e69976f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0c06bd1122 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  34. 5d86701 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev by Bill Yi · 5 years ago
  35. 18e41d0 Merge "DO NOT MERGE DMD: Support minimum refresh rate" into qt-r1-dev am: 9b94c35a54 by Adrian Salido · 5 years ago
  36. 33b9c6b [automerger skipped] DO NOT MERGE DMD: Support minimum refresh rate am: 86ce8f764b by Long Ling · 5 years ago
  37. 1d20f20 Merge "Fix integer overflow in make_timestamp_ns_locked" into qt-qpr1-dev by TreeHugger Robot · 5 years ago
  38. b55bf00 Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev by Pengquan Meng · 5 years ago
  39. 0c06bd1 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev by TreeHugger Robot · 5 years ago
  40. 8ceaffb Merge "[DO NOT MERGE]Daggerize Android Auto" into qt-qpr1-dev am: 3684678602 by Neil Fuller · 5 years ago
  41. 3e0a59b [DO NOT MERGE]Daggerize Android Auto am: 8d49d0d63f by Govinda Wasserman · 5 years ago
  42. 3684678 Merge "[DO NOT MERGE]Daggerize Android Auto" into qt-qpr1-dev by Neil Fuller · 5 years ago
  43. 8d49d0d [DO NOT MERGE]Daggerize Android Auto by Govinda Wasserman · 5 years ago
  44. 7227ff1 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager by Long Ling · 5 years ago
  45. dde62480 DO NOT MERGE DeviceConfig: Add Name space and keys for Display Manager by Long Ling · 5 years ago
  46. e05a580 Merge "Hold Display suspend blocker until doze starts" into qt-r1-dev am: 48a86feefe by Santos Cordon · 5 years ago
  47. 323160d [automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 by Lucas Dupin · 5 years ago
  48. 666fbf7 [automerger skipped] Import translations. DO NOT MERGE am: 1c99d77a36 -s ours by Bill Yi · 5 years ago
  49. b2bf0d3 Merge "Adapt to google::protobuf::int64 type change" into stage-aosp-master am: e9a702d526 am: 2b3c5c79c0 by Colin Cross · 5 years ago
  50. 43a8d7b Merge changes from topic "device_config_for_display_90" into qt-r1-dev am: 36da9bb9ff by Long Ling · 5 years ago
  51. 80f9ea6 [automerger skipped] DO NOT MERGE Move device config key high_refresh_rate_blacklist to display_manager am: 6f13f12213 by Long Ling · 5 years ago
  52. 02142d5 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 by Oscar Shu · 5 years ago
  53. 4f05f46 Merge "avoid generating reserved local MACs" am: e5d5b73109 am: 65a98b4002 by Oscar Shu · 5 years ago
  54. 4999ce0 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a am: 3f1d5d92fc by Tobias Thierer · 5 years ago
  55. 1f64582 Support WAC decoding in UMTS format by Pengquan Meng · 5 years ago
  56. 1b6d718 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a by Tobias Thierer · 5 years ago
  57. 2582943 Import translations. DO NOT MERGE by Bill Yi · 5 years ago
  58. 65a98b4 Merge "avoid generating reserved local MACs" am: e5d5b73109 by Oscar Shu · 5 years ago
  59. 3f1d5d9 Merge "Move default MimeMap implementation to frameworks." am: 19c3bdc88a by Tobias Thierer · 5 years ago
  60. 7a5ba3f Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master am: 6948bc8ce1 by Neil Fuller · 5 years ago
  61. 2b52914 Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master by Neil Fuller · 5 years ago
  62. 6948bc8 Merge "resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master" into stage-aosp-master by Neil Fuller · 5 years ago
  63. f324cd9 Merge "change network suggestion notification content string" into qt-qpr1-dev by Nate Jiang · 5 years ago
  64. a43b5f2 Merge "change network suggestion notification content string" into qt-qpr1-dev by Nate Jiang · 5 years ago
  65. a8aa5ab [automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master am: d3f8bbc6c0 -s ours by Remi NGUYEN VAN · 5 years ago
  66. 56ac6f1 [automerger skipped] Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master by Remi NGUYEN VAN · 5 years ago
  67. d3f8bbc Merge "Remove DeviceConfig usage from NetworkStackClient" into stage-aosp-master by Remi NGUYEN VAN · 5 years ago
  68. 7002e2a [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev by Bill Yi · 5 years ago
  69. a570db9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev by Bill Yi · 5 years ago
  70. b7ad07a Merge "Import translations. DO NOT MERGE" into qt-r1-dev by TreeHugger Robot · 5 years ago
  71. a8de0ae Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev by TreeHugger Robot · 5 years ago
  72. 88f982a Merge "Add manifest flag to enable prerelease driver." into qt-qpr1-dev by Peiyong Lin · 5 years ago
  73. 83392f4 Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev by Adrian Salido · 5 years ago
  74. 594180c Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours by Yi Kong · 5 years ago
  75. ce8fa14 Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp by Sasha Smundak · 5 years ago
  76. bc80fff Merge "Add manifest flag to enable prerelease driver." into qt-qpr1-dev by Peiyong Lin · 5 years ago
  77. 6877071 Merge "[automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check am: fbafa5162a -s ours am skip reason: change_id I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79 with SHA1 a0914d81ef is in history" into qt-dev-plus-aosp by Android Build Merger (Role) · 5 years ago
  78. 37dadbc [automerger skipped] Disable modernize-use-trailing-return-type clang-tidy check by Yi Kong · 5 years ago
  79. b059564 Import translations. DO NOT MERGE by Bill Yi · 5 years ago
  80. 73c6f3ca Merge "Android.bp file to convert current.api to XML format." into qt-dev-plus-aosp by TreeHugger Robot · 5 years ago
  81. c5441b2 Merge "Revert "Hold Display suspend blocker until doze starts"" into qt-r1-dev by Adrian Salido · 5 years ago
  82. 9872a4d Fix integer overflow in make_timestamp_ns_locked by Roman Kiryanov · 5 years ago
  83. 975bd46 Fix android-cloexec-pipe clang-tidy warning am: 1fa946a2f2 by Yi Kong · 5 years ago
  84. 82f5c4e Import translations. DO NOT MERGE by Bill Yi · 5 years ago
  85. fbafa51 Disable modernize-use-trailing-return-type clang-tidy check by Yi Kong · 5 years ago
  86. aba3391 Merge "Fix Handling of user switching for headless user 0 model." into qt-qpr1-dev by Ram Periathiruvadi · 5 years ago
  87. f4fc3e2 Merge "Fix Handling of user switching for headless user 0 model." into qt-qpr1-dev by Ram Periathiruvadi · 5 years ago
  88. e9f2369 Merge "Hold a strong reference to the callback in TextClassifierService" into qt-qpr1-dev by Tony Mak · 5 years ago
  89. 1fa946a2 Fix android-cloexec-pipe clang-tidy warning by Yi Kong · 5 years ago
  90. 2b95253 Disable modernize-use-trailing-return-type clang-tidy check am: a0914d81ef by Yi Kong · 5 years ago
  91. bb6f832 resolve merge conflicts of bd592e043991a525dd6ecf95acd8f50052bb22e2 to stage-aosp-master by Santos Cordon · 5 years ago
  92. 8247b5f Merge "Hold a strong reference to the callback in TextClassifierService" into qt-qpr1-dev by TreeHugger Robot · 5 years ago
  93. a0914d8 Disable modernize-use-trailing-return-type clang-tidy check by Yi Kong · 5 years ago
  94. 36966ca Revert "Hold Display suspend blocker until doze starts" by Adrian Salido · 5 years ago
  95. e6bd365 change network suggestion notification content string by Nate Jiang · 5 years ago
  96. 9d15770 Merge "Fix legacy role holder resolution for assistant, dialer and SMS." into qt-qpr1-dev by Hai Zhang · 5 years ago
  97. d4c175c Merge "Fix legacy role holder resolution for assistant, dialer and SMS." into qt-qpr1-dev by TreeHugger Robot · 5 years ago
  98. ecd1c9b Merge "Add fields to Cellbroadcast" into qt-qpr1-dev am: 455fc80450 by Pengquan Meng · 5 years ago
  99. 2676517 Merge "Limit the number of Notif Channels per app" into qt-qpr1-dev by Julia Reynolds · 5 years ago
  100. 455fc80 Merge "Add fields to Cellbroadcast" into qt-qpr1-dev by Pengquan Meng · 5 years ago