| commit | 5c25701ba63a9655b5aa0d7d0d235e9688bfb2ba | [log] [tgz] |
|---|---|---|
| author | ruiniviz <ivan.izmailov@harman.com> | Wed Apr 18 14:15:40 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 18 14:15:40 2018 -0700 |
| tree | 0de3952e1b49af1dff391892686aae5d65daf4a8 | |
| parent | 6dfb5adf0fd40f6df8c0478146f4d4320800c248 [diff] | |
| parent | 5679c755aa896c3169ca4cd7ec4e97afe2a92842 [diff] |
Merge "Merge "Merge "Excluding ScreenLock test for automotive" into marshmallow-cts-dev am: eb30239ed6" into nougat-cts-dev am: 6b87d8f716" into nougat-mr1-cts-dev am: 5679c755aa Change-Id: Ibd021175fcbec0f8fe0d2facd54a29763198dcf4