diff options
| author | Daniel Sandler <dsandler@android.com> | 2021-06-10 15:44:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-10 15:44:57 +0000 |
| commit | 77a0173a1cf599ed7fbc896b8f0d68c53f3672f1 (patch) | |
| tree | 225416ed0fcc4e18918cbca6572c8a75f425cb05 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 121fab622e5ce766103d60e6052fe31e67f1ee39 (diff) | |
| parent | 99c8d90be8dc5fc139b7d91b7897b09b09cfa5bd (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: 6d4c20323b -s ours am: 99c8d90be8 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673294
Change-Id: I433a0712f0f628d57037054ef52dd2c3fde7b3f5
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions