commit | fba7c0d1457436df92e2c20b2c3f1d6e30085203 | [log] [tgz] |
---|---|---|
author | Raj Mamadgi <r.mamadgi@samsung.com> | Tue Jan 16 18:38:12 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jan 16 18:38:12 2018 +0000 |
tree | 803d0930138fe16e5182638bee61d0e1a99a01fb | |
parent | 574ee81d023ca0990b8930f64ba03a7546d7a938 [diff] | |
parent | cb32fa09ad3a5225f4e4419337ba3cf59f481b1c [diff] |
Merge "Fix for Adding delay to testUnlock" into marshmallow-cts-dev am: cb32fa09ad -s ours Change-Id: Ieac91a9e5b871a48cf1c909b353f95677cd9cb19