am 259668d8: am 410e2df4: Merge "CircleFramedDrawable incorrectly has implicit dependency on the hosting view size." into jb-mr2-dev

* commit '259668d82ffb66c35a97ea5fff8acf39d948019d':
  CircleFramedDrawable incorrectly has implicit dependency on the hosting view size.