Google Git
Sign in
android / platform / frameworks / base / d852f17eeb6d597d346ad5cdd537201997e4faa6
commitd852f17eeb6d597d346ad5cdd537201997e4faa6[log] [tgz]
authorSongchun Fan <schfan@google.com>Wed Dec 09 00:48:06 2020 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>Wed Dec 09 00:48:06 2020 +0000
treea839aba5fee5159141abe11f77032a84e6b1a74d
parentcad5f6492c87ae3aa760c295721c7e22a715ad48 [diff]
parentcb3efa67c952c77942ec1d79573232576f0e4dbf [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: cb3efa67c9 -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: I03e3a616b87ed09e98c72782ea2b7a3fb9ee602d
tree: a839aba5fee5159141abe11f77032a84e6b1a74d
  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. MODULE_LICENSE_APACHE2
  51. NOTICE
  52. pathmap.mk
  53. PREUPLOAD.cfg
  54. StubLibraries.bp
  55. TEST_MAPPING