tree c16341f60b75a13f6d3e5954d8577125aa4f1390
parent 8b1e0e1254048254244d486c4bb15292fe8449fe
parent 4b2cecbb53aaa74c506ea0b318ede05f84756843
author Geoffrey Pitsch <gpitsch@google.com> 1494879475 +0000
committer android-build-merger <android-build-merger@google.com> 1494879475 +0000

Merge "Center switch vertically with primary text" into oc-dev
am: 4b2cecbb53

Change-Id: I07e16d38defe17b09d24bb8f19994564773e0540