Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 1de555b1a3f88e485c9bcef27fb64c3cfccbed95
commit1de555b1a3f88e485c9bcef27fb64c3cfccbed95[log] [tgz]
authorBill Yi <byi@google.com>Sat Sep 19 05:51:33 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Sat Sep 19 05:51:33 2020 +0000
treea04fceb8f132ee498e860bf018efe7d14234240d
parent847cfb2230b7692f99521ba58d644ffbea397a97 [diff]
parent2075ab0f01c49547b81f032a117ca26b701f1312 [diff]
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: e935e010b3 am: 2075ab0f01 -s ours

am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

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

Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
tree: a04fceb8f132ee498e860bf018efe7d14234240d
  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