tree 70c51d92248bd0e9dc74eca6f6ae52d1fc459265
parent 39b371d04cf3f243f1b7a94c86321d6b0aeddea5
parent 401a26075cb0d1e0305d658cdd68020ad5099251
author Chien-Yu Chen <cychen@google.com> 1466460228 +0000
committer android-build-merger <android-build-merger@google.com> 1466460228 +0000

Merge \"CameraIts: Fix test_param_shading_mode with no display\" into marshmallow-cts-dev
am: 401a26075c

Change-Id: I3819f0200b760a2ec2c2eb62c5bed43fc077f895