tree 86752504141ed41604e87f038734a660583ee398
parent 8fc70289b5cf8a0f93a4dd02cf9b61243b3cda3d
parent 5c950a8078e37eb9057da4aa5b3355189b675291
author Hang Yin <yinh@google.com> 1464388826 +0000
committer android-build-merger <android-build-merger@google.com> 1464388826 +0000

Merge "Code Patch for camera preview switch tests" into nyc-dev
am: 5c950a8078

* commit '5c950a8078e37eb9057da4aa5b3355189b675291':
  Code Patch for camera preview switch tests

Change-Id: I90e4880c7ec7d41c7b4b402b66c6e25b0006eb64