commit | aaa79a6a4cfade4b3a8e4cf3c75f6a2ec2f1a451 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Mon Jun 20 22:37:43 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 20 22:37:43 2016 +0000 |
tree | 9d069935dcb2a987aba2ad936bb2306fa4ab7829 | |
parent | ec8a96089e578c0cec48a1d261c47792cf5a1041 [diff] | |
parent | 25f8e02bfe5c0efdfa977790e24162867070bc56 [diff] |
Merge \\\\\\"CameraIts: Fix test_param_shading_mode with no display\\\\\\" into marshmallow-cts-dev am: 401a26075c am: 7f7603fb93 am: f829c25dfb am: 3dcb937786 am: 09e87f4058 am: 25f8e02bfe Change-Id: Ia1a18f04dc625be3bab641fac6926fe41d197ce7