Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 50c77976376dfcde681a435414dbee9414bba617
commit50c77976376dfcde681a435414dbee9414bba617[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Aug 10 22:42:49 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Aug 10 22:42:49 2021 +0000
tree73f1aaad63da1c0a61d68bd6223240759cdeaa98
parenta540241260c445ff971f9966b144520af2ac8381 [diff]
parent7162d024b22432733be3d3960a6ca01c8da9172d [diff]
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours

am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history

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

Change-Id: Ia7b043f41c17732d468dc64daa819d978d1e2650
tree: 73f1aaad63da1c0a61d68bd6223240759cdeaa98
  1. apct-tests/
  2. api/
  3. cmds/
  4. config/
  5. core/
  6. data/
  7. docs/
  8. drm/
  9. graphics/
  10. keystore/
  11. libs/
  12. location/
  13. lowpan/
  14. media/
  15. native/
  16. nfc-extras/
  17. obex/
  18. opengl/
  19. packages/
  20. proto/
  21. rs/
  22. samples/
  23. sax/
  24. services/
  25. startop/
  26. telecomm/
  27. telephony/
  28. test-base/
  29. test-legacy/
  30. test-mock/
  31. test-runner/
  32. tests/
  33. tools/
  34. wifi/
  35. .gitignore
  36. Android.bp
  37. Android.mk
  38. CleanSpec.mk
  39. jarjar_rules_hidl.txt
  40. MODULE_LICENSE_APACHE2
  41. NOTICE
  42. pathmap.mk
  43. PREUPLOAD.cfg