Merge "Fix FrameSequenceDrawable scaling with circle mask" am: a59975d908
am: 93980c692a

Change-Id: Ie708dbd3fa6980a80ece5d02545048fa3b97e501
tree: cf472d1dde1c93a39b7d513284c5531456208869
  1. camera2/
  2. common/
  3. framesequence/
  4. photoviewer/
  5. widget/
  6. CleanSpec.mk