Google Git
Sign in
android / platform / frameworks / base / af10f4e4a61c794ad711c9d5c2a5845ba081d1df
commitaf10f4e4a61c794ad711c9d5c2a5845ba081d1df[log] [tgz]
authorXiangyu/Malcolm Chen <refuhoo@google.com>Wed Apr 08 02:11:10 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Apr 08 02:11:10 2020 +0000
treec0bef3f302f632c036734a617a454e61806bead7
parente470eaf6b64a8dfe4bc2064971a3b72a3dd884ad [diff]
parent53d83d01e5023184f4eb16b0813f4e6415b066aa [diff]
[automerger skipped] Merge "multiSimAllowed should be consistent with max active modem property." am: 2641543774 am: f4804c9e92 -s ours am: 94664fd08f -s ours am: 8dbfbf7400 -s ours am: 53d83d01e5 -s ours

am skip reason: Change-Id I2d38dd9a0a860ee451fe51372a62c2910b88c88f with SHA-1 ba874c6827 is in history

Change-Id: Idb76250ed59f50f44665a4c8154e87ff2bff95d4
tree: c0bef3f302f632c036734a617a454e61806bead7
  1. apct-tests/
  2. apex/
  3. api/
  4. cmds/
  5. config/
  6. core/
  7. data/
  8. docs/
  9. drm/
  10. graphics/
  11. identity/
  12. keystore/
  13. libs/
  14. location/
  15. lowpan/
  16. media/
  17. mime/
  18. mms/
  19. native/
  20. nfc-extras/
  21. obex/
  22. opengl/
  23. packages/
  24. proto/
  25. rs/
  26. samples/
  27. sax/
  28. services/
  29. startop/
  30. telecomm/
  31. telephony/
  32. test-base/
  33. test-legacy/
  34. test-mock/
  35. test-runner/
  36. tests/
  37. tools/
  38. wifi/
  39. .clang-format
  40. .gitignore
  41. .mailmap
  42. Android.bp
  43. Android.mk
  44. ApiDocs.bp
  45. CleanSpec.mk
  46. framework-jarjar-rules.txt
  47. MODULE_LICENSE_APACHE2
  48. NOTICE
  49. pathmap.mk
  50. PREUPLOAD.cfg
  51. StubLibraries.bp
  52. TEST_MAPPING