tree 316667fe1aa2345c6778545d713c465d330c6988
parent efe9f0523d3a1c694e128537d406b56ac3a40f47
parent 3e83e8ee6575b1db8cf76fc0a399d209d64c17d1
author Evan Laird <evanlaird@google.com> 1560436579 -0700
committer android-build-merger <android-build-merger@google.com> 1560436579 -0700

Merge "Set channel dialog switches to 48dp height" into qt-dev
am: 3e83e8ee65

Change-Id: Iac825bf2f52b3bff59b522b57a71e30af1de2bd9