Merge "Tweak AlertDialog and Preference layout for nonround watches." into cw-f-dev am: 4ad89bf51f am: bbc8d1d6ec
am: 0e9286ea1e
Change-Id: I5daef113542e6aa1ff000da475cd3dc6b5a82e0b
This commit is contained in: