diff options
| author | Daniel Sandler <dsandler@android.com> | 2021-06-10 15:45:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-10 15:45:03 +0000 |
| commit | c154863198f7bdb539dfe42955298ac0930f1380 (patch) | |
| tree | 225416ed0fcc4e18918cbca6572c8a75f425cb05 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 77a0173a1cf599ed7fbc896b8f0d68c53f3672f1 (diff) | |
| parent | be14ed48707373872ed574341f5a6ea715318407 (diff) | |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 51855b1f12 -s ours am: be14ed4870 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673294
Change-Id: I2e9482e9bc488e07a50bb6c8a9b5359917ec0540
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions