| commit | 7682b37e960d90e6e5335d33d6e65aa2baa4a44f | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Tue Jan 16 18:38:37 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 16 18:38:37 2018 +0000 |
| tree | 803d0930138fe16e5182638bee61d0e1a99a01fb | |
| parent | 574ee81d023ca0990b8930f64ba03a7546d7a938 [diff] | |
| parent | fba7c0d1457436df92e2c20b2c3f1d6e30085203 [diff] |
Merge "Merge "Fix for Adding delay to testUnlock" into marshmallow-cts-dev am: cb32fa09ad -s ours" into nougat-cts-dev