| commit | 55c2ede7566e4ce42fcf5a4dbfc474e7eaaa5e55 | [log] [tgz] |
|---|---|---|
| author | eddy-sh.chen <eddy-sh.chen@mstarsemi.com> | Fri Aug 04 09:44:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 09:44:35 2017 +0000 |
| tree | caa93e34530e7c52f51733a0f4de06501f36b30f | |
| parent | 0f9fc578b1055e318da7c0d6f0412b87560715ae [diff] | |
| parent | 3d92545c63fd24cb70f5efdc46ec8fee1915c75a [diff] |
Merge "Merge "Disabling EncryptionTests on Android television" into marshmallow-cts-dev am: 5c74cceb07 -s ours" into nougat-cts-dev am: 3d92545c63 Change-Id: Id059bc1a5da6e2bfa6f8c1151eee0d0d27366737