tree 6c92df1b7061c0ee23bee71f87f59e18c3292712
parent daa7a388e6661c467afd4a719e617729d90a9e59
parent 0d0f22372faef0c4dcee2d9594622b1b87baccba
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583753326 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583753326 +0000

Merge "Fix mismatched parameter of font scale change" into rvc-dev am: 5580360ba8 am: 2694d3ca71 am: 0d0f22372f

Change-Id: I302ce2742f35121f36c60ad0d7600abcedbcfe64