tree 313a16acf370c7e3002d5614ea3b052eccdcf951
parent 6938d8b565a9ab42c7741262049e0c86138c55e0
parent 0876ff6eb3483e903ba40a69e03f7d4058e3ae47
author Dake Gu <dake@google.com> 1474995449 +0000
committer android-build-merger <android-build-merger@google.com> 1474995449 +0000

Merge "Rename attribute dotRadius to avoid conflicts with wear" into nyc-mr1-dev am: 71b3721540 am: 19442f100f
am: 0876ff6eb3

Change-Id: I56478a3b6a832febe0b0fadd294f13134535f3df