tree 1e3ceb8170b87df5b7e2f7407b3fe401ec2dd60d
parent 92311e8db66442f6eaae219030aedcdc094f3ccf
parent 03abf5215a1b6d7c1d1394ed8e221adedd690c7a
author Yin-Chia Yeh <yinchiayeh@google.com> 1441300540 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1441300540 +0000

Merge "Camera: make sure preview won't slow down video" into mnc-dev