Gitiles
Code Review Sign In
gerrit.omnirom.org / android_frameworks_base / f77ada8689fb53ffa2b6a3bfb77288b7cb55ceec
  1. f77ada8 Remove unused AllocationBacking am: 8941e34d37 am: 1675211aa9 am: e4e0ffdf0f by Eric Rahm · 2 years, 5 months ago
  2. e4e0ffd Remove unused AllocationBacking am: 8941e34d37 am: 1675211aa9 by Eric Rahm · 2 years, 5 months ago
  3. 1675211a Remove unused AllocationBacking am: 8941e34d37 by Eric Rahm · 2 years, 5 months ago
  4. b034aa7 Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main am: 5314b09104 am: 9a1e46321c am: f5e5b53e69 by Mark Hansen · 2 years, 5 months ago
  5. 47a6a47 Merge "Remove unused HIDL mapper library from libservices.core" into main am: 85138b8f59 am: df4e70bb0e am: 123a3d4146 by Treehugger Robot · 2 years, 5 months ago
  6. 995a9c5 Merge "[CDM] Make CDM transport APIs available to the system services" into udc-dev-plus-aosp am: 442e30b8d5 by Raphael Kim · 2 years, 5 months ago
  7. f5e5b53 Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main am: 5314b09104 am: 9a1e46321c by Mark Hansen · 2 years, 5 months ago
  8. 123a3d4 Merge "Remove unused HIDL mapper library from libservices.core" into main am: 85138b8f59 am: df4e70bb0e by Treehugger Robot · 2 years, 5 months ago
  9. 442e30b Merge "[CDM] Make CDM transport APIs available to the system services" into udc-dev-plus-aosp by Raphael Kim · 2 years, 5 months ago
  10. 7407332 Merge "Update language to comply with Android's inclusive language guidance" into main am: 892ede1c98 am: 3640b11db9 am: 828f8b4660 by Chan Kim · 2 years, 5 months ago
  11. a48b2c5 Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 78ee7a5e61 am: 0f9eafc3d3 am: b14e4b0fff am: 18b2a9bf90 by Treehugger Robot · 2 years, 5 months ago
  12. 4068e9a [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours am: 4cd1d533ae -s ours am: f95ef389ae -s ours am: 2370478bdf -s ours by Aaron Liu · 2 years, 5 months ago
  13. 8418543 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 68af1ce6b7 -s ours am: 9e5e6c87b3 -s ours am: 0f7ac7b84e -s ours am: e09ac26720 -s ours by Aaron Liu · 2 years, 5 months ago
  14. ca0892a Merge "Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 8d77298ccd am: 2b59bed3dd am: 3eda0bd7ed" into udc-d1-dev-plus-aosp by Automerger Merge Worker · 2 years, 5 months ago
  15. 0dbc9f7 Merge "Merge "Update language to comply with Android's inclusive language guidance" into main am: d57068d7de am: 407947e270 am: 33a9e91f8c" into udc-d1-dev-plus-aosp by Automerger Merge Worker · 2 years, 5 months ago
  16. 9a1e463 Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main am: 5314b09104 by Mark Hansen · 2 years, 5 months ago
  17. 3004d87 Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 8d77298ccd am: 2b59bed3dd am: 3eda0bd7ed by Treehugger Robot · 2 years, 5 months ago
  18. c29a6cd Merge "Update language to comply with Android's inclusive language guidance" into main am: d57068d7de am: 407947e270 am: 33a9e91f8c by Chan Kim · 2 years, 5 months ago
  19. de81482 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: cd141a0378 -s ours am: a71c9ea8f3 -s ours am: 3cff3efbdd -s ours by Aaron Liu · 2 years, 5 months ago
  20. c137916 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 4bc73341f6 -s ours am: 19150ff1da -s ours am: c99f704d93 -s ours by Aaron Liu · 2 years, 5 months ago
  21. df4e70b Merge "Remove unused HIDL mapper library from libservices.core" into main am: 85138b8f59 by Treehugger Robot · 2 years, 5 months ago
  22. 5314b09 Merge "Move LayerType @ViewDebug.Exported annotation from private field to public method" into main by Mark Hansen · 2 years, 5 months ago
  23. c359be0 Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 78ee7a5e61 am: 0f9eafc3d3 am: b14e4b0fff am: ca531761de by Treehugger Robot · 2 years, 5 months ago
  24. 78789ae [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours am: 4cd1d533ae -s ours am: f95ef389ae -s ours am: a16a6ad3f8 -s ours by Aaron Liu · 2 years, 5 months ago
  25. a97295c [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 68af1ce6b7 -s ours am: 9e5e6c87b3 -s ours am: 0f7ac7b84e -s ours am: 140537d9de -s ours by Aaron Liu · 2 years, 5 months ago
  26. 07ebf2f Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 8d77298ccd am: 2b59bed3dd am: 149214a29d by Treehugger Robot · 2 years, 5 months ago
  27. 8f78b0a [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: cd141a0378 -s ours am: a71c9ea8f3 -s ours am: 3ee067c038 -s ours by Aaron Liu · 2 years, 5 months ago
  28. 828f8b46 Merge "Update language to comply with Android's inclusive language guidance" into main am: 892ede1c98 am: 3640b11db9 by Chan Kim · 2 years, 5 months ago
  29. ddc7bbf [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 4bc73341f6 -s ours am: 19150ff1da -s ours am: 6b7bfb67ea -s ours by Aaron Liu · 2 years, 5 months ago
  30. 33a9e91 Merge "Update language to comply with Android's inclusive language guidance" into main am: d57068d7de am: 407947e270 by Chan Kim · 2 years, 5 months ago
  31. 18b2a9b Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 78ee7a5e61 am: 0f9eafc3d3 am: b14e4b0fff by Treehugger Robot · 2 years, 5 months ago
  32. 2370478 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours am: 4cd1d533ae -s ours am: f95ef389ae -s ours by Aaron Liu · 2 years, 5 months ago
  33. e09ac26 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 68af1ce6b7 -s ours am: 9e5e6c87b3 -s ours am: 0f7ac7b84e -s ours by Aaron Liu · 2 years, 5 months ago
  34. 3eda0bd Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 8d77298ccd am: 2b59bed3dd by Treehugger Robot · 2 years, 5 months ago
  35. 3cff3ef [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: cd141a0378 -s ours am: a71c9ea8f3 -s ours by Aaron Liu · 2 years, 5 months ago
  36. c99f704 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 4bc73341f6 -s ours am: 19150ff1da -s ours by Aaron Liu · 2 years, 5 months ago
  37. ca53176 Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 78ee7a5e61 am: 0f9eafc3d3 am: b14e4b0fff by Treehugger Robot · 2 years, 5 months ago
  38. a16a6ad [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours am: 4cd1d533ae -s ours am: f95ef389ae -s ours by Aaron Liu · 2 years, 5 months ago
  39. 140537d [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 68af1ce6b7 -s ours am: 9e5e6c87b3 -s ours am: 0f7ac7b84e -s ours by Aaron Liu · 2 years, 5 months ago
  40. 149214a Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 8d77298ccd am: 2b59bed3dd by Treehugger Robot · 2 years, 5 months ago
  41. 3ee067c [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: cd141a0378 -s ours am: a71c9ea8f3 -s ours by Aaron Liu · 2 years, 5 months ago
  42. 85138b8 Merge "Remove unused HIDL mapper library from libservices.core" into main by Treehugger Robot · 2 years, 5 months ago
  43. 6b7bfb6 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 4bc73341f6 -s ours am: 19150ff1da -s ours by Aaron Liu · 2 years, 5 months ago
  44. b14e4b0 Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 78ee7a5e61 am: 0f9eafc3d3 by Treehugger Robot · 2 years, 5 months ago
  45. f95ef38 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours am: 4cd1d533ae -s ours by Aaron Liu · 2 years, 5 months ago
  46. 0f7ac7b [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 68af1ce6b7 -s ours am: 9e5e6c87b3 -s ours by Aaron Liu · 2 years, 5 months ago
  47. 1ef44a6 Merge "Implement DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO AE user restriction" into udc-dev-plus-aosp am: 2e75599006 by Roshan Pius · 2 years, 5 months ago
  48. 2b59bed Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 8d77298ccd by Treehugger Robot · 2 years, 5 months ago
  49. a71c9ea [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: cd141a0378 -s ours by Aaron Liu · 2 years, 5 months ago
  50. 19150ff [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 4bc73341f6 -s ours by Aaron Liu · 2 years, 5 months ago
  51. cd3af1d [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: baaedb5d8a -s ours am: 0f2ef46b2c -s ours am: a870bc848f -s ours am: 180b49b366 -s ours by Aaron Liu · 2 years, 5 months ago
  52. aaf810e [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 39ac11212f -s ours am: 44e017894f -s ours am: d7bdf0120e -s ours am: 847bff3019 -s ours by Aaron Liu · 2 years, 5 months ago
  53. 3640b11 Merge "Update language to comply with Android's inclusive language guidance" into main am: 892ede1c98 by Chan Kim · 2 years, 5 months ago
  54. 349b7c8 Merge "Fix kotlin nullable errors in CredentialManager" into udc-dev-plus-aosp am: 64f08db3b4 by Treehugger Robot · 2 years, 5 months ago
  55. 407947e Merge "Update language to comply with Android's inclusive language guidance" into main am: d57068d7de by Chan Kim · 2 years, 5 months ago
  56. b186cfe [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: f2dc3a1976 -s ours am: 740b82fbd4 -s ours am: 1cfa63114a -s ours by Aaron Liu · 2 years, 5 months ago
  57. 98c98f6 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 9fec3cf094 -s ours am: f9cc621d4e -s ours am: 4da1d27323 -s ours by Aaron Liu · 2 years, 5 months ago
  58. 0f9eafc Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 am: 78ee7a5e61 by Treehugger Robot · 2 years, 5 months ago
  59. 4cd1d53 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours am: 29ddd8326a -s ours by Aaron Liu · 2 years, 5 months ago
  60. 9e5e6c8 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours am: 68af1ce6b7 -s ours by Aaron Liu · 2 years, 5 months ago
  61. 2e75599 Merge "Implement DISALLOW_NEAR_FIELD_COMMUNICATION_RADIO AE user restriction" into udc-dev-plus-aosp by Roshan Pius · 2 years, 5 months ago
  62. 892ede1 Merge "Update language to comply with Android's inclusive language guidance" into main by Chan Kim · 2 years, 5 months ago
  63. 64f08db Merge "Fix kotlin nullable errors in CredentialManager" into udc-dev-plus-aosp by Treehugger Robot · 2 years, 5 months ago
  64. 850b23a Update language to comply with Android's inclusive language guidance by Chan Kim · 2 years, 5 months ago
  65. b30e95a [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: baaedb5d8a -s ours am: 0f2ef46b2c -s ours am: a870bc848f -s ours am: ba5e3f15c4 -s ours by Aaron Liu · 2 years, 5 months ago
  66. 34184bc [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 39ac11212f -s ours am: 44e017894f -s ours am: d7bdf0120e -s ours am: 812d46db28 -s ours by Aaron Liu · 2 years, 5 months ago
  67. a8cdfca [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: f2dc3a1976 -s ours am: 740b82fbd4 -s ours am: 7b109c77f2 -s ours by Aaron Liu · 2 years, 5 months ago
  68. 186f334 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 9fec3cf094 -s ours am: f9cc621d4e -s ours am: a8df515bdb -s ours by Aaron Liu · 2 years, 5 months ago
  69. 20e9f69 Merge "Use String8/16 c_str [audio]" into main am: b904e85c6a am: 8a19026a74 am: 1d18a0e9b5 by Treehugger Robot · 2 years, 5 months ago
  70. 1dcf759 Merge "Update language to comply with Android's inclusive language guidance" into main am: f32761d8eb am: 5211c02dfe am: d7e8e59ff6 by Treehugger Robot · 2 years, 5 months ago
  71. 05da6b2 Merge "nfc(api): Restore behavior from Android T (follow-up)" into main am: 34b915e141 am: e39b954415 am: 9583aec2ab by Treehugger Robot · 2 years, 5 months ago
  72. 180b49b [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: baaedb5d8a -s ours am: 0f2ef46b2c -s ours am: a870bc848f -s ours by Aaron Liu · 2 years, 5 months ago
  73. 847bff3 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 39ac11212f -s ours am: 44e017894f -s ours am: d7bdf0120e -s ours by Aaron Liu · 2 years, 5 months ago
  74. 1cfa631 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: f2dc3a1976 -s ours am: 740b82fbd4 -s ours by Aaron Liu · 2 years, 5 months ago
  75. 4da1d27 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 9fec3cf094 -s ours am: f9cc621d4e -s ours by Aaron Liu · 2 years, 5 months ago
  76. ba5e3f1 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: baaedb5d8a -s ours am: 0f2ef46b2c -s ours am: a870bc848f -s ours by Aaron Liu · 2 years, 5 months ago
  77. 812d46d [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 39ac11212f -s ours am: 44e017894f -s ours am: d7bdf0120e -s ours by Aaron Liu · 2 years, 5 months ago
  78. 7b109c7 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: f2dc3a1976 -s ours am: 740b82fbd4 -s ours by Aaron Liu · 2 years, 5 months ago
  79. a8df515 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 9fec3cf094 -s ours am: f9cc621d4e -s ours by Aaron Liu · 2 years, 5 months ago
  80. 78ee7a5 Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 by Treehugger Robot · 2 years, 5 months ago
  81. 29ddd83 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours by Aaron Liu · 2 years, 5 months ago
  82. 8d77298 Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f am: 8c85c68c47 by Treehugger Robot · 2 years, 5 months ago
  83. a870bc8 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: baaedb5d8a -s ours am: 0f2ef46b2c -s ours by Aaron Liu · 2 years, 5 months ago
  84. 68af1ce [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours by Aaron Liu · 2 years, 5 months ago
  85. cd141a0 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev am: 3402768ce6 -s ours by Aaron Liu · 2 years, 5 months ago
  86. 4bc7334 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: 080a4992b2 -s ours by Aaron Liu · 2 years, 5 months ago
  87. d7bdf01 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 39ac11212f -s ours am: 44e017894f -s ours by Aaron Liu · 2 years, 5 months ago
  88. d57068d Merge "Update language to comply with Android's inclusive language guidance" into main by Chan Kim · 2 years, 5 months ago
  89. 1d18a0e Merge "Use String8/16 c_str [audio]" into main am: b904e85c6a am: 8a19026a74 by Treehugger Robot · 2 years, 5 months ago
  90. d7e8e59 Merge "Update language to comply with Android's inclusive language guidance" into main am: f32761d8eb am: 5211c02dfe by Treehugger Robot · 2 years, 5 months ago
  91. 740b82f [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: f2dc3a1976 -s ours by Aaron Liu · 2 years, 5 months ago
  92. 8a19026 Merge "Use String8/16 c_str [audio]" into main am: b904e85c6a by Treehugger Robot · 2 years, 5 months ago
  93. 9583aec Merge "nfc(api): Restore behavior from Android T (follow-up)" into main am: 34b915e141 am: e39b954415 by Treehugger Robot · 2 years, 5 months ago
  94. f9cc621d [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 9fec3cf094 -s ours by Aaron Liu · 2 years, 5 months ago
  95. 5211c02 Merge "Update language to comply with Android's inclusive language guidance" into main am: f32761d8eb by Treehugger Robot · 2 years, 5 months ago
  96. 8c85c68c Merge "[SettingsProvider] verify ringtone URI before setting" into rvc-dev am: 941891258d am: 037f529f7d am: 456da723a4 am: ff4b06296f am: 9fd44ec14f by Treehugger Robot · 2 years, 5 months ago
  97. b904e85 Merge "Use String8/16 c_str [audio]" into main by Treehugger Robot · 2 years, 5 months ago
  98. 0f2ef46 [automerger skipped] Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into sc-dev am: c3ff2922a9 am: ece9f89205 -s ours am: 5c21bd3c9a -s ours am: 54a9e88d9e -s ours am: baaedb5d8a -s ours by Aaron Liu · 2 years, 5 months ago
  99. 44e0178 [automerger skipped] DO NOT MERGE Ensure finish lockscreen when usersetup incomplete am: da4c8f81d9 am: ace3f5c853 -s ours am: 2bfa0ed02d -s ours am: 88e7122ebc -s ours am: 39ac11212f -s ours by Aaron Liu · 2 years, 5 months ago
  100. 3402768 Merge "DO NOT MERGE Ensure finish lockscreen when usersetup incomplete" into tm-dev by Aaron Liu · 2 years, 5 months ago