Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / a81b7e9f7b4e88d1f7f6c6b941ea6efa3033af6a
commita81b7e9f7b4e88d1f7f6c6b941ea6efa3033af6a[log] [tgz]
authorAlex Johnston <acjohnston@google.com>Tue Feb 16 16:13:49 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Feb 16 16:13:49 2021 +0000
tree07a1e05a4f90444a66bec6daccaaad224ec915aa
parent4bea9e0a8ef22ae8376a951e77fde988cd850217 [diff]
parent3f7da94bcf7af5aeb39dca3331f5b572dfe1a97c [diff]
[automerger skipped] Merge "Allow PO to enable network logging on work profile" into sc-dev am: 3f7da94bcf -s ours

am skip reason: Change-Id I4727ba7cbc62f9cd187f82a9527f0475345fd555 with SHA-1 e64fa9e7f7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9a553422e64e86c8d7285e9fc3fba60ce87cd5e
tree: 07a1e05a4f90444a66bec6daccaaad224ec915aa
  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. lowpan/
  19. media/
  20. mime/
  21. mms/
  22. native/
  23. nfc-extras/
  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. BATTERY_STATS_OWNERS
  49. CleanSpec.mk
  50. framework-jarjar-rules.txt
  51. METADATA
  52. MODULE_LICENSE_APACHE2
  53. MULTIUSER_OWNERS
  54. NOTICE
  55. OWNERS
  56. OWNERS.md
  57. pathmap.mk
  58. PREUPLOAD.cfg
  59. StubLibraries.bp
  60. TEST_MAPPING
  61. ZYGOTE_OWNERS