Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 3201b6ee341cd9b03ad0f6f309c51b8c43c274b2
commit3201b6ee341cd9b03ad0f6f309c51b8c43c274b2[log] [tgz]
authorChris Tate <ctate@android.com>Tue Apr 27 22:33:12 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Apr 27 22:33:12 2021 +0000
treee1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f
parent45c4c9f1ec46a7fa38bf421a32498f1725c95310 [diff]
parent0dbc306379ce012757242abb7ed81b7e7777123a [diff]
[automerger skipped] Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into qt-dev am: 7b0067c950 am: 05dd5f18e3 -s ours am: 0dbc306379 -s ours

am skip reason: Merged-In I1c2bb78d86f194585d273661cecf3419f51965df with SHA-1 8cb7e0a881 is already in history

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

Change-Id: I06f7d74e63da08fc07090cd6fb960cc0f1ffb5b2
tree: e1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f
  1. .prebuilt_info/
  2. apct-tests/
  3. apex/
  4. api/
  5. cmds/
  6. config/
  7. core/
  8. data/
  9. docs/
  10. drm/
  11. errorprone/
  12. graphics/
  13. identity/
  14. keystore/
  15. libs/
  16. location/
  17. lowpan/
  18. media/
  19. mime/
  20. mms/
  21. native/
  22. nfc-extras/
  23. non-updatable-api/
  24. obex/
  25. opengl/
  26. packages/
  27. proto/
  28. rs/
  29. samples/
  30. sax/
  31. services/
  32. startop/
  33. telecomm/
  34. telephony/
  35. test-base/
  36. test-legacy/
  37. test-mock/
  38. test-runner/
  39. tests/
  40. tools/
  41. wifi/
  42. .clang-format
  43. .gitignore
  44. .mailmap
  45. Android.bp
  46. Android.mk
  47. ApiDocs.bp
  48. CleanSpec.mk
  49. framework-jarjar-rules.txt
  50. MODULE_LICENSE_APACHE2
  51. NOTICE
  52. pathmap.mk
  53. PREUPLOAD.cfg
  54. StubLibraries.bp
  55. TEST_MAPPING