Google Git
Sign in
android / platform / frameworks / base.git / a5ab8308f4be3156295cbaa1ca83b4337972abd5
commita5ab8308f4be3156295cbaa1ca83b4337972abd5[log] [tgz]
authorTreeHugger Robot <treehugger-gerrit@google.com>Mon Feb 08 17:48:54 2021 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Feb 08 17:48:54 2021 +0000
tree157917073f9d0be6b1e692d6c130dc26f88f60a4
parent98807ed3a72bfd4a0fd035a06f24d84169bce5a2 [diff]
parent2fffbcb7dfafdb61e2f0265e8265f66985c63147 [diff]
[automerger skipped] Merge "resolve merge conflicts of a13fc7f314ac56e75eca09c94db8090f928023ff to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours am: 2fffbcb7df -s ours

am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51c19517a358f1f8cc69bdf18f00d99cdf05c573
tree: 157917073f9d0be6b1e692d6c130dc26f88f60a4
  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