Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / dfe49aa5eef31cebedef3bee0809634db85702dd
commitdfe49aa5eef31cebedef3bee0809634db85702dd[log] [tgz]
authorPhilip P. Moltmann <moltmann@google.com>Mon Nov 09 19:58:06 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Nov 09 19:58:06 2020 +0000
treefec3c0d983ff37625d82b1d9a7df9579ec1e4c67
parentb40e378f876371fcf583bdb4924f43af9543802e [diff]
parent5a72f60cd99a197c64a225831445987fbe437b7e [diff]
[automerger skipped] Merge changes from topic "12940341" into oc-dev am: a9a03ae669 am: b172aaf747 am: 37beb3172b -s ours am: 5ea00f8c6c -s ours am: b77727b905 -s ours am: f2bc09c705 -s ours am: 5a72f60cd9 -s ours

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

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

Change-Id: I11b4d01a8b89de288e5790dee9add521d4f39250
tree: fec3c0d983ff37625d82b1d9a7df9579ec1e4c67
  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