| commit | 5295630fd88b259a98bf710da04255e7898e2b5c | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Fri Aug 04 09:44:47 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Aug 04 09:44:47 2017 +0000 |
| tree | caa93e34530e7c52f51733a0f4de06501f36b30f | |
| parent | 0f9fc578b1055e318da7c0d6f0412b87560715ae [diff] | |
| parent | 55c2ede7566e4ce42fcf5a4dbfc474e7eaaa5e55 [diff] |
Merge "Merge "Merge "Disabling EncryptionTests on Android television" into marshmallow-cts-dev am: 5c74cceb07 -s ours" into nougat-cts-dev am: 3d92545c63" into nougat-mr1-cts-dev