Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 5c62f01896f0d4969d37b044e1e8e0727c91b8eb
commit5c62f01896f0d4969d37b044e1e8e0727c91b8eb[log] [tgz]
authorBill Yi <byi@google.com>Mon Sep 14 21:18:54 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Sep 14 21:18:54 2020 +0000
tree5e7087388b8589c2120d350808ffd47dbe44ef9f
parent1183f4a548af64997f12ec386ef7dfa6c573b673 [diff]
parent938d3bb1f55c9840734290620598717a5cffc9ee [diff]
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours

am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

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

Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
tree: 5e7087388b8589c2120d350808ffd47dbe44ef9f
  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. METADATA
  51. MODULE_LICENSE_APACHE2
  52. NOTICE
  53. pathmap.mk
  54. PREUPLOAD.cfg
  55. StubLibraries.bp
  56. TEST_MAPPING