| commit | 2e277b7a2d0dfc8b792bab9cdf3fe5f54976ef21 | [log] [tgz] |
|---|---|---|
| author | eddy-sh.chen <eddy-sh.chen@mstarsemi.com> | Fri Aug 04 05:56:43 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 04 05:56:43 2017 +0000 |
| tree | f78bba3588c9010d37b9dfb48d35263e31b4e53d | |
| parent | 8a42fc27f8f0188636632a339061fdf6af573a67 [diff] | |
| parent | 781f8b2028ff6b889d572f9531f0912efcde04a4 [diff] |
Merge "Disabling EncryptionTests on Android television" into marshmallow-cts-dev am: 5c74cceb07 am: 781f8b2028 Change-Id: I0b1f30f45e7a20a5ca6c0c1860f2b0f50420a10e