Google Git
Sign in
android / platform / frameworks / base / 655789af79fbb1f42c733fe82444c31ee10caca4
commit655789af79fbb1f42c733fe82444c31ee10caca4[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Fri Nov 06 19:27:49 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Nov 06 19:27:49 2020 +0000
treef1c91008c96f0f876869775cdfb18463a18f46ca
parent6bd7effa4c92d47004ccdda1a7f34af6ae1cb737 [diff]
parent9f415e9bada6be62ab82dfa7100bf5653cf18e49 [diff]
[automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours am: 8b8dba96db -s ours am: 4f68954df7 -s ours am: 9f415e9bad -s ours

am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: I280990ec81b83a3487dcd5f6b80409171e158024
tree: f1c91008c96f0f876869775cdfb18463a18f46ca
  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