tree df9a359543e8976509d36104b99c47ee212b4d4e
parent 4ce79b85ace4f73648db4623678bdf4e3b0d61a1
parent 39f9d64276cfa4090c00e0c281de6cea64b44542
author Takeshi Oishi <Takeshi.Oishi@jp.sony.com> 1479403066 +0000
committer android-build-merger <android-build-merger@google.com> 1479403066 +0000

Merge "fix android.hardware.camera2.cts.CameraManagerTest#testManagerGetDeviceIdList for TV am: 14475f7ab0" into nougat-cts-dev
am: 39f9d64276

Change-Id: I7ce5e4f6d940405e0bb4c2ddeb8b33c03a1f852c