tree 271e9646eed564aee62974bddb5150991eb32d2d
parent eff9661b2a6ca3e80b7fa8be7915b661ace15069
parent e599488968f41cf7ad7f6b0fbdc3ce37213e38da
author John Spurlock <jspurlock@google.com> 1403283732 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1403223872 +0000

Merge "If we're not showing switch text, don't include in measure."