tree 164db441cae0afe9040f8780ce7e383eafab4188
parent 0b1b94583c6737375f2d646b85eb86ec6292df45
parent b53acd946d1a5dd819d2fc208176250ae636a699
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 1445960554 +0000
committer android-build-merger <android-build-merger@google.com> 1445960554 +0000

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

* commit 'b53acd946d1a5dd819d2fc208176250ae636a699':
  Fix CameraManagerTest logic.