Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / b97a4169a7072e0c7f77ed193e0fee75f8407490
commitb97a4169a7072e0c7f77ed193e0fee75f8407490[log] [tgz]
authorMotomu Utsumi <motomuman@google.com>Wed Feb 14 12:51:46 2024 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Feb 14 12:51:46 2024 +0000
treedabdd8b9f10cfb341f704d7893fc0edd0496076a
parentbb84cbd3e9989c4034c397288ee5c8a1ae891c8a [diff]
parent754cda0caa04319543c1bca5af59ede8a83300bc [diff]
[automerger skipped] Merge "Remove aconfig flags for Connectivity FlaggedAPI annotations" into main am: 754cda0caa -s ours

am skip reason: Merged-In Ie8e0f911d0f7d7e81d108b8e8ab539b29a255ad0 with SHA-1 1cd6cadb84 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2919289

Change-Id: I5a3844b707c33607454d84bfb6276428cf385341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: dabdd8b9f10cfb341f704d7893fc0edd0496076a
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. boot/
  6. cmds/
  7. config/
  8. core/
  9. data/
  10. docs/
  11. drm/
  12. errorprone/
  13. graphics/
  14. identity/
  15. keystore/
  16. libs/
  17. location/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc/
  23. nfc-extras/
  24. obex/
  25. omapi/
  26. opengl/
  27. packages/
  28. proto/
  29. ravenwood/
  30. rs/
  31. samples/
  32. sax/
  33. services/
  34. startop/
  35. telecomm/
  36. telephony/
  37. test-base/
  38. test-legacy/
  39. test-mock/
  40. test-runner/
  41. tests/
  42. tools/
  43. wifi/
  44. .clang-format
  45. .gitignore
  46. .mailmap
  47. AconfigFlags.bp
  48. ADPF_OWNERS
  49. Android.bp
  50. Android.mk
  51. BAL_OWNERS
  52. BATTERY_STATS_OWNERS
  53. BROADCASTS_OWNERS
  54. CleanSpec.mk
  55. framework-jarjar-rules.txt
  56. GAME_MANAGER_OWNERS
  57. INPUT_OWNERS
  58. INTENT_OWNERS
  59. ktfmt_includes.txt
  60. lint-baseline.xml
  61. MEMORY_OWNERS
  62. METADATA
  63. MODULE_LICENSE_APACHE2
  64. MULTIUSER_OWNERS
  65. NOTICE
  66. OWNERS
  67. OWNERS.md
  68. PACKAGE_MANAGER_OWNERS
  69. pathmap.mk
  70. PERFORMANCE_OWNERS
  71. PREUPLOAD.cfg
  72. ProtoLibraries.bp
  73. Ravenwood.bp
  74. SECURITY_STATE_OWNERS
  75. SQLITE_OWNERS
  76. TEST_MAPPING
  77. TestProtoLibraries.bp
  78. THERMAL_OWNERS
  79. TRACE_OWNERS
  80. WEAR_OWNERS
  81. ZYGOTE_OWNERS