Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / c1fc66c9a9d8ef5559ee9db6df8224f572373378
commitc1fc66c9a9d8ef5559ee9db6df8224f572373378[log] [tgz]
authorBrad Ebinger <breadley@google.com>Wed Dec 02 01:55:27 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Dec 02 01:55:27 2020 +0000
tree1ecb1b942ca3308de260a8ce8bcf62adde52f1b0
parent3e871d1373ae5fb4a4681c41684f6b0a4705cadc [diff]
parent5f32287f80b24019af600865378533932c773eb4 [diff]
[automerger skipped] Merge "Add new carrier config option for enabling SIP PUBLISH of RCS caps" am: 88f8c04dc3 am: f833ff0d2c am: 5f32287f80 -s ours

am skip reason: Change-Id If9ab9836261afc2d6cebb959690d8b44b06a3dfe with SHA-1 4612ab7b8c is in history

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

Change-Id: I17122ddace137ba1520f08be47927e8ec128e4d2
tree: 1ecb1b942ca3308de260a8ce8bcf62adde52f1b0
  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. obex/
  24. opengl/
  25. packages/
  26. proto/
  27. rs/
  28. samples/
  29. sax/
  30. services/
  31. startop/
  32. telecomm/
  33. telephony/
  34. test-base/
  35. test-legacy/
  36. test-mock/
  37. test-runner/
  38. tests/
  39. tools/
  40. wifi/
  41. .clang-format
  42. .gitignore
  43. .mailmap
  44. Android.bp
  45. Android.mk
  46. ApiDocs.bp
  47. CleanSpec.mk
  48. framework-jarjar-rules.txt
  49. METADATA
  50. MODULE_LICENSE_APACHE2
  51. NOTICE
  52. pathmap.mk
  53. PREUPLOAD.cfg
  54. StubLibraries.bp
  55. TEST_MAPPING