resolve merge conflicts of 89cdd4cb to mnc-dev

Change-Id: Ie1421dc0fed3c3a20c5c146a253b27b8678a6207
1 file changed
tree: c031169e1c500b3d684d591e0f6c206dd2ff3b85
  1. CleanSpec.mk
  2. camera2/
  3. common/
  4. framesequence/
  5. photoviewer/
  6. widget/