Gitiles
Code Review Sign In
gerrit.omnirom.org / android_frameworks_base / 3aaf48ffc6c7e59bdd0927f41a818b60f6d0b20d
  1. 3aaf48f Merge "Revert "Using clippath for adaptive icon drawable instead of bit..."" into tm-qpr-dev am: 132b386fc5 by Sebastián Franco · 3 years, 7 months ago
  2. 764dab7 Merge "Fetch correct sandboxsdk packageUid for a user" into tm-qpr-dev am: e738f84a74 by Shiwangi Shah · 3 years, 7 months ago
  3. 0d6ff93 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 am: 2488ef52b4 am: f43a706e53 am: 53e69c7eb3 by Orion Hodson · 3 years, 7 months ago
  4. 5999bc2 Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 am: 1fb227f17f am: 788c6cc563 am: 7e87ea0629 by Lorenzo Colitti · 3 years, 7 months ago
  5. 3745374 Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a am: a728156a2d am: 1c9e3b6c5a am: 3a47e2f6e9 by Treehugger Robot · 3 years, 7 months ago
  6. 74cc53c Merge "Add NAMESPACE_NEARBY String" am: 4339e51473 am: 9bd0f75bf4 am: f58897e737 am: f4b45a5faa by Xinyi Zhou · 3 years, 7 months ago
  7. 132b386 Merge "Revert "Using clippath for adaptive icon drawable instead of bit..."" into tm-qpr-dev by Sebastián Franco · 3 years, 7 months ago
  8. 2fd8d5e Merge "Use local status for convert profile" am: 7aab6bbe3d am: b9b3f78f04 am: 1e239a8a4d am: 44e565c255 by Dorin Drimus · 3 years, 7 months ago
  9. a0fe064 Merge "Set up UX directory and OWNERS for the credentials module." am: d6a9de158b am: 3a7780a6a9 am: cc8e173f70 am: ddd5d13250 by Helen Qin · 3 years, 7 months ago
  10. 074bff5 Merge "Keystore: Included KM_TAG_RSA_OAEP_MGF_DIGEST tag" am: eea63d6aa4 am: f42d5e8847 am: 72b1cc3e49 am: 3f20176ddf by Treehugger Robot · 3 years, 7 months ago
  11. e738f84 Merge "Fetch correct sandboxsdk packageUid for a user" into tm-qpr-dev by Shiwangi Shah · 3 years, 7 months ago
  12. d0609b0 Merge "Move PiP swiftly in response to IME with keep clear areas flag enabled." into tm-qpr-dev am: 56cf35b281 by Mateusz Cicheński · 3 years, 7 months ago
  13. 56cf35b Merge "Move PiP swiftly in response to IME with keep clear areas flag enabled." into tm-qpr-dev by Mateusz Cicheński · 3 years, 7 months ago
  14. ca178e8 [automerger skipped] Merge "DO NOT MERGE: Enable presubmit for com.android.internal.jank" into tm-qpr-dev am: 9a54da6d23 -s ours by Wu Ahan · 3 years, 7 months ago
  15. 7692742 [automerger skipped] DO NOT MERGE: Enable presubmit for com.android.internal.jank am: 87c0106ea7 -s ours by Ahan Wu · 3 years, 7 months ago
  16. 9a54da6 Merge "DO NOT MERGE: Enable presubmit for com.android.internal.jank" into tm-qpr-dev by Wu Ahan · 3 years, 7 months ago
  17. 88d4577 Merge "Do not use stableDisplaySize for scale factor" into tm-qpr-dev am: fa561d3934 by Beverly Tai · 3 years, 7 months ago
  18. 39d8a4c Merge "Update FP sensor location before showing dwellAnim" into tm-qpr-dev am: 668090c09b by Beverly Tai · 3 years, 7 months ago
  19. fa561d3 Merge "Do not use stableDisplaySize for scale factor" into tm-qpr-dev by Beverly Tai · 3 years, 7 months ago
  20. 668090c Merge "Update FP sensor location before showing dwellAnim" into tm-qpr-dev by Beverly Tai · 3 years, 7 months ago
  21. 53e69c7 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 am: 2488ef52b4 am: f43a706e53 by Orion Hodson · 3 years, 7 months ago
  22. 7e87ea0 Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 am: 1fb227f17f am: 788c6cc563 by Lorenzo Colitti · 3 years, 7 months ago
  23. 3a47e2f Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a am: a728156a2d am: 1c9e3b6c5a by Treehugger Robot · 3 years, 7 months ago
  24. f4b45a5 Merge "Add NAMESPACE_NEARBY String" am: 4339e51473 am: 9bd0f75bf4 am: f58897e737 by Xinyi Zhou · 3 years, 7 months ago
  25. 44e565c Merge "Use local status for convert profile" am: 7aab6bbe3d am: b9b3f78f04 am: 1e239a8a4d by Dorin Drimus · 3 years, 7 months ago
  26. ddd5d13 Merge "Set up UX directory and OWNERS for the credentials module." am: d6a9de158b am: 3a7780a6a9 am: cc8e173f70 by Helen Qin · 3 years, 7 months ago
  27. 3f20176 Merge "Keystore: Included KM_TAG_RSA_OAEP_MGF_DIGEST tag" am: eea63d6aa4 am: f42d5e8847 am: 72b1cc3e49 by Treehugger Robot · 3 years, 7 months ago
  28. f43a706 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 am: 2488ef52b4 by Orion Hodson · 3 years, 7 months ago
  29. 788c6cc Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 am: 1fb227f17f by Lorenzo Colitti · 3 years, 7 months ago
  30. 1c9e3b6 Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a am: a728156a2d by Treehugger Robot · 3 years, 7 months ago
  31. f58897e Merge "Add NAMESPACE_NEARBY String" am: 4339e51473 am: 9bd0f75bf4 by Xinyi Zhou · 3 years, 7 months ago
  32. 1e239a8 Merge "Use local status for convert profile" am: 7aab6bbe3d am: b9b3f78f04 by Dorin Drimus · 3 years, 7 months ago
  33. cc8e173 Merge "Set up UX directory and OWNERS for the credentials module." am: d6a9de158b am: 3a7780a6a9 by Helen Qin · 3 years, 7 months ago
  34. 72b1cc3 Merge "Keystore: Included KM_TAG_RSA_OAEP_MGF_DIGEST tag" am: eea63d6aa4 am: f42d5e8847 by Treehugger Robot · 3 years, 7 months ago
  35. 2488ef5 Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3 by Orion Hodson · 3 years, 7 months ago
  36. 773627c Merge "Prefer valueOf() to boxed primitive constructors" by Orion Hodson · 3 years, 7 months ago
  37. afc70ab Merge "Cleans up any stray instances of KeyguardUpdateMonitor that might still have listeners attached to system services." into tm-qpr-dev am: d5d35fb282 by Chandru S · 3 years, 7 months ago
  38. 3f9605b Merge "Add test size to TakeScreenshotServiceTest" into tm-qpr-dev am: 03ef589f1d by TreeHugger Robot · 3 years, 7 months ago
  39. d5d35fb Merge "Cleans up any stray instances of KeyguardUpdateMonitor that might still have listeners attached to system services." into tm-qpr-dev by Chandru S · 3 years, 7 months ago
  40. 03ef589f Merge "Add test size to TakeScreenshotServiceTest" into tm-qpr-dev by TreeHugger Robot · 3 years, 7 months ago
  41. 2fa046e Merge "Allow bugreport only after server-side config loaded" into tm-qpr-dev am: 95ffd81e8f by TreeHugger Robot · 3 years, 7 months ago
  42. 95ffd81 Merge "Allow bugreport only after server-side config loaded" into tm-qpr-dev by TreeHugger Robot · 3 years, 7 months ago
  43. 46ddfb3 Merge "Reduce flicker when split pair switching" into tm-qpr-dev am: 1c2c0b5258 by Tony Huang · 3 years, 7 months ago
  44. b010a6a Merge "To read the group UUID, the calling app either needs carrier privileges or the READ_PHONE_STATE permission and access to device identifiers." into tm-qpr-dev am: 2dbb6cb421 by Hyosun Kim · 3 years, 7 months ago
  45. 9ba3089 Merge "Added QS Screen Record Animated Icons" into tm-qpr-dev am: 3507c76df0 by Rasheed Lewis · 3 years, 7 months ago
  46. 1c2c0b5 Merge "Reduce flicker when split pair switching" into tm-qpr-dev by Tony Huang · 3 years, 7 months ago
  47. 2dbb6cb Merge "To read the group UUID, the calling app either needs carrier privileges or the READ_PHONE_STATE permission and access to device identifiers." into tm-qpr-dev by Hyosun Kim · 3 years, 7 months ago
  48. 3507c76 Merge "Added QS Screen Record Animated Icons" into tm-qpr-dev by Rasheed Lewis · 3 years, 7 months ago
  49. 1fb227f Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 by Lorenzo Colitti · 3 years, 7 months ago
  50. 5fbb561 Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" by Lorenzo Colitti · 3 years, 7 months ago
  51. a728156 Merge "Remove Python enables identical to global defaults." am: 3fd51ff02a by Treehugger Robot · 3 years, 7 months ago
  52. c6cfbc3 Merge "Updated QS Airplane Mode Icons" into tm-qpr-dev am: bff2fa5fd8 by Rasheed Lewis · 3 years, 7 months ago
  53. 3fd51ff Merge "Remove Python enables identical to global defaults." by Treehugger Robot · 3 years, 7 months ago
  54. bff2fa5 Merge "Updated QS Airplane Mode Icons" into tm-qpr-dev by Rasheed Lewis · 3 years, 7 months ago
  55. 6d119e6 Merge "Allow background activity launch by drag notification" into tm-qpr-dev am: d7e17f97c7 by TreeHugger Robot · 3 years, 7 months ago
  56. 77ed49f Merge "New QS Flashlight Tile Animated Icons" into tm-qpr-dev am: 1d5c1dd93b by Rasheed Lewis · 3 years, 7 months ago
  57. b5ce442 Merge "Refactor UDFPS display logic and remove illumination" into tm-qpr-dev am: 1ecaa4d68e by Ilya Matyukhin · 3 years, 7 months ago
  58. d7e17f9 Merge "Allow background activity launch by drag notification" into tm-qpr-dev by TreeHugger Robot · 3 years, 7 months ago
  59. 1d5c1dd Merge "New QS Flashlight Tile Animated Icons" into tm-qpr-dev by Rasheed Lewis · 3 years, 7 months ago
  60. d4f9500 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours am: ae5b80ab72 -s ours by Songchun Fan · 3 years, 7 months ago
  61. 1ecaa4d Merge "Refactor UDFPS display logic and remove illumination" into tm-qpr-dev by Ilya Matyukhin · 3 years, 7 months ago
  62. b5a0ee4 Merge "[automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -s ours" into tm-d1-dev-plus-aosp am: eacb009bf0 -s ours by Automerger Merge Worker · 3 years, 7 months ago
  63. 4d3c166 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -s ours am: f016b1a511 -s ours by Songchun Fan · 3 years, 7 months ago
  64. 2df7222 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e am: d69adc8368 by Daniel Norman · 3 years, 7 months ago
  65. 2ca66e7 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: 0ac6337d21 am: e5b113cf3b by Daniel Norman · 3 years, 7 months ago
  66. 461d2ef [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours am: 8592e712e5 -s ours by TreeHugger Robot · 3 years, 7 months ago
  67. 86226ec Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours" into tm-d1-dev-plus-aosp am: bf54253f59 -s ours by Automerger Merge Worker · 3 years, 7 months ago
  68. 0002695 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours am: dc87896a7f -s ours by TreeHugger Robot · 3 years, 7 months ago
  69. b5c3c90 Merge "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours" into tm-d1-dev-plus-aosp am: bd74af9134 by Automerger Merge Worker · 3 years, 7 months ago
  70. 86c10b4 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours am: e9fb70d0df -s ours by Matt Pietal · 3 years, 7 months ago
  71. 796c219 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: 769b05b529 -s ours am: 9f2a677234 -s ours by Matt Pietal · 3 years, 7 months ago
  72. 4e03943 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours am: 43ae247466 -s ours by Songchun Fan · 3 years, 7 months ago
  73. d4c1132 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e am: ea127ffb59 by Daniel Norman · 3 years, 7 months ago
  74. cc69aa6 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours am: 86b114ee53 -s ours by TreeHugger Robot · 3 years, 7 months ago
  75. b3f01e3 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours am: 78a3712266 -s ours by Matt Pietal · 3 years, 7 months ago
  76. ae5b80a [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours by Songchun Fan · 3 years, 7 months ago
  77. eacb009 Merge "[automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -s ours" into tm-d1-dev-plus-aosp by Automerger Merge Worker · 3 years, 7 months ago
  78. 43ae247 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 3f6eaacb35 -s ours by Songchun Fan · 3 years, 7 months ago
  79. f016b1a [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours am: 18e656dc3c -s ours by Songchun Fan · 3 years, 7 months ago
  80. d69adc8 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e by Daniel Norman · 3 years, 7 months ago
  81. ea127ff Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: d5d9652c4e by Daniel Norman · 3 years, 7 months ago
  82. e5b113c Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 am: 0ac6337d21 by Daniel Norman · 3 years, 7 months ago
  83. 8592e71 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours by TreeHugger Robot · 3 years, 7 months ago
  84. bf54253 Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours" into tm-d1-dev-plus-aosp by Automerger Merge Worker · 3 years, 7 months ago
  85. 86b114e [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: 10c40702d8 -s ours by TreeHugger Robot · 3 years, 7 months ago
  86. dc87896 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours am: df8c08f7e9 -s ours by TreeHugger Robot · 3 years, 7 months ago
  87. bd74af9 Merge "[automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours" into tm-d1-dev-plus-aosp by Automerger Merge Worker · 3 years, 7 months ago
  88. 9f2a677 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: 769b05b529 -s ours by Matt Pietal · 3 years, 7 months ago
  89. e9fb70d [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours by Matt Pietal · 3 years, 7 months ago
  90. 78a3712 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours am: cf19e19498 -s ours by Matt Pietal · 3 years, 7 months ago
  91. 24e0f52 Merge "Fix MIME type of non-plain text share intents" into tm-qpr-dev am: 6118cfd13f by Matt Casey · 3 years, 7 months ago
  92. 3f6eaacb3 [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours by Songchun Fan · 3 years, 7 months ago
  93. d5d9652 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 by Daniel Norman · 3 years, 7 months ago
  94. 10c4070 [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours by TreeHugger Robot · 3 years, 7 months ago
  95. 18e656d [automerger skipped] Merge "[pm] forbid deletion of protected packages" into qt-dev am: b625b562c4 am: ae7a1df57d -s ours am: 478c97e58c -s ours am: 526af0d1b1 -s ours am: 151d75d3e8 -s ours am: d05066f4f7 -s ours am: 01a79b5ded -s ours am: 0d99f58638 -s ours by Songchun Fan · 3 years, 7 months ago
  96. cf19e19 [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours by Matt Pietal · 3 years, 7 months ago
  97. 0ac6337 Merge "Include all enabled services when FEEDBACK_ALL_MASK." into qt-dev am: 6505ed1695 am: 7588fa6866 am: 10c659e317 am: 73089d0c3a am: 18628f192f am: cf886522f8 am: 70f81ff108 am: ef85e63542 by Daniel Norman · 3 years, 7 months ago
  98. df8c08f [automerger skipped] Merge "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock" into qt-dev am: c184d7b721 am: f3c6684b16 -s ours am: 5ddcc96b01 -s ours am: b7075acb14 -s ours am: 97f625773a -s ours am: 605261cc55 -s ours am: 1e7904ddd3 -s ours am: e8b730b552 -s ours by TreeHugger Robot · 3 years, 7 months ago
  99. 769b05b [automerger skipped] [conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4 am: 02b525316e -s ours am: d17cc27210 -s ours am: 898d578fa1 -s ours am: 9b928f8140 -s ours am: e855f9c3b3 -s ours am: 7c4da0ebf1 -s ours am: aebe4548c2 -s ours by Matt Pietal · 3 years, 7 months ago
  100. 6118cfd Merge "Fix MIME type of non-plain text share intents" into tm-qpr-dev by Matt Casey · 3 years, 7 months ago