tree cc75c345ea39fb42bee8cd9676e2627ab6ddb19c
parent a5c11b4ae479fad53dfc472c8ff78c3850fc5434
parent bc058faaa3558579ff23a6dca1f9049cdee07247
author Zhen Zhang <zzhen@google.com> 1562091708 -0700
committer android-build-merger <android-build-merger@google.com> 1562091708 -0700

Merge "Change quick setting min_num_tiles number and text to resources value." into qt-dev
am: bc058faaa3

Change-Id: I329be5dee77d6f45b4bd5314971655df52525294