tree 21ad4c9d75d1f89d6824eb43746a210eeb9ae362
parent 0a52f2fe2a93a30476853b1726ea06bb862b9470
parent 13c7d89d1f64bdb782bddd2a6e8cdb81b7e77886
author Dake Gu <dake@google.com> 1474994786 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1474994787 +0000

Merge "Rename attribute dotRadius to avoid conflicts with wear" into nyc-mr1-dev