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

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