tree 8e6d1cf46238d8a87273c6bb784df945866bb01e
parent 374f0f48d21a642ba442597a92f5a169b70e0cf0
parent 1fa8999c91d5df81949aa723000058380cd3faa2
author Zhijun He <zhijunhe@google.com> 1433466467 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433466468 +0000

Merge "Camera2: implement high speed video APIs" into mnc-dev