tree 3d2c8a1ad83466c2ed5fc4fa5b11c2f110dc1c0f
parent 6aae4fecd715ed7959a36bed9a2ad276bcfd2020
parent adfddc122c709a85ac9a75ba0a9fcdf7c17aca18
author Daniel Xie <dxie@google.com> 1444760810 +0000
committer android-build-merger <android-build-merger@google.com> 1444760810 +0000

Merge "Camera2: fix video stabilization test" into marshmallow-cts-dev
am: adfddc122c

* commit 'adfddc122c709a85ac9a75ba0a9fcdf7c17aca18':
  Camera2: fix video stabilization test