tree 5afde96efee10d8083aae675c16c846601ee1646
parent 045cfb101119e5288bfcfbc433834f95a1b07a94
parent 7a4b1f97e0cc395aa423d56b48b2957d8f4fd486
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 1445960287 +0000
committer android-build-merger <android-build-merger@google.com> 1445960287 +0000

Merge "Fix CameraManagerTest logic." into marshmallow-cts-dev
am: 7a4b1f97e0

* commit '7a4b1f97e0cc395aa423d56b48b2957d8f4fd486':
  Fix CameraManagerTest logic.