Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 1b3ce3d0c6d043e9151a50422727c5e853abff38
commit1b3ce3d0c6d043e9151a50422727c5e853abff38[log] [tgz]
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Oct 05 23:47:27 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Mon Oct 05 23:47:27 2020 +0000
tree4c5346ab3429265a4286fdffaeaa122466bed30d
parentfc0ba9cab17e7f27af5f65571e7c6de439dcb8df [diff]
parentddb6bdf1677217376de8f06d3d0cb4e0fa49f5f8 [diff]
Merge "[automerger skipped] Fix the issue provider can be wrong when requesting slice permission am: 4cab9c3876 -s ours am: f994f0c0c4 -s ours am: 4843e3fd7a -s ours am: 52dec242d7 -s ours" into mainline-prod am: ddb6bdf167 -s ours

am skip reason: Change-Id I8b66c02786df4096dad74b7e76255d5ddd1d609d with SHA-1 e3eba1322b is in history

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

Change-Id: I5e6cf1fe7db15e7dbf831f692c1bff49694b179b
tree: 4c5346ab3429265a4286fdffaeaa122466bed30d
  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