Google Git
Sign in
android / platform / frameworks / base / 3516e98daa362286cd7e1daec7ef1e207e34c5b4
commit3516e98daa362286cd7e1daec7ef1e207e34c5b4[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Tue Feb 09 23:41:02 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Tue Feb 09 23:41:02 2021 +0000
treea8699091e6d8d6ee50f51ca53e022fcee78a9d35
parent6766245f1094ae5c447c2b7cde26a3e671723b12 [diff]
parent88ad6db9f3737ed4283b409636c10cc01939bc1b [diff]
Merge changes from topic "cdm_overlay-oc-mr1-dev" into oc-mr1-dev am: 5382574928 am: 0847618070 am: 77d6da8435 am: 88ad6db9f3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97e2cfb8ccae18862b73fc4360016abfe1aa6613
tree: a8699091e6d8d6ee50f51ca53e022fcee78a9d35
  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