Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 4ba8aa407fac9a749bcfe56ceb7b009fdf49d371
commit4ba8aa407fac9a749bcfe56ceb7b009fdf49d371[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Sep 04 11:45:26 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Sep 04 11:45:26 2020 +0000
tree8319687fc73911705cea79427cc774ec5d2677cc
parent3a780c3da8edf4c9e344ea0cf184c6b857ea972c [diff]
parent89dc04ff76db168ba1319a30a0b38b657038db4a [diff]
Merge "[automerger skipped] Merge "Require permission to create trusted displays" into rvc-dev am: 2c0137794d am: c0f911ce35 -s ours am: f3c3d9fa63 -s ours" into rvc-qpr-dev-plus-aosp am: 89dc04ff76 -s ours

am skip reason: Change-Id Id06b2013ef5fdeadf321f14f8b611c733031d54d with SHA-1 f21c885ca7 is in history

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

Change-Id: Icba5b7f3283e74a78760e5d98b2598195e0bb286
tree: 8319687fc73911705cea79427cc774ec5d2677cc
  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. METADATA
  51. MODULE_LICENSE_APACHE2
  52. NOTICE
  53. pathmap.mk
  54. PREUPLOAD.cfg
  55. StubLibraries.bp
  56. TEST_MAPPING