tree 27f0aa436a2a340bfee4066577f17fbb3223b2cb
parent 919024c751129f5f7533d486bb5e4ad2092f477f
parent 71b3721540e9f3c23ac2e660dfbfa8435e37c31b
author Dake Gu <dake@google.com> 1474995102 +0000
committer android-build-merger <android-build-merger@google.com> 1474995102 +0000

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

Change-Id: I6d81b569998e29e0e7b509d79a1eb6e4ac51cd46