Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 523608f2032451fd9d432e8f9f1eeeab44dc269d
commit523608f2032451fd9d432e8f9f1eeeab44dc269d[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Aug 28 01:30:07 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Fri Aug 28 01:30:07 2020 +0000
tree6af42ddd7ce49edfe375bc25f05f2ddf4d1d7e16
parent7bd63e429f07797853d7c76c04ebf22bf5efbdc0 [diff]
parent6811659f34a33a7e118e729d09d615c767bee4a3 [diff]
[automerger skipped] Merge changes from topic "am-4f55cf354ee849c8a9efbca3e14ade7f" into rvc-d1-dev-plus-aosp am: 6811659f34 -s ours

am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: I1a98aeb45ba1eb97c6e924b881e1d34e69709249
tree: 6af42ddd7ce49edfe375bc25f05f2ddf4d1d7e16
  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. diff
  50. framework-jarjar-rules.txt
  51. METADATA
  52. MODULE_LICENSE_APACHE2
  53. NOTICE
  54. pathmap.mk
  55. PREUPLOAD.cfg
  56. StubLibraries.bp
  57. TEST_MAPPING