Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_base / 8e179885441142abfc814b59cb1d0c35be129a09
commit8e179885441142abfc814b59cb1d0c35be129a09[log] [tgz]
authorSongchun Fan <schfan@google.com>Wed Dec 09 00:55:51 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Dec 09 00:55:51 2020 +0000
treea3534c606c6777421595e1f4ea1ec1d711d47925
parentb25a30fbdeaf372a64a0ed4f3a6f5509621b1403 [diff]
parent042b06f0b18fc7fd0efea28eac3c69210776753b [diff]
[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-dev am: 1a96cae421 -s ours am: e8630b7a20 -s ours am: 0d8b71b182 -s ours am: 042b06f0b1 -s ours

am skip reason: Change-Id I32f3b7ece78ec8cc97c52a0484151a6a777aa9da with SHA-1 edeb081ad8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ba3fbc0b6ca129a31c43bd2c0902fb19480fea0
tree: a3534c606c6777421595e1f4ea1ec1d711d47925
  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. OWNERS
  53. OWNERS.md
  54. pathmap.mk
  55. PREUPLOAD.cfg
  56. StubLibraries.bp
  57. TEST_MAPPING
  58. ZYGOTE_OWNERS