diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-09 19:52:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-09 19:52:19 +0000 |
| commit | 0be93338493ae62f0429eb329ae3dec85db1356a (patch) | |
| tree | e59ac2f1a7a7b6b08cf18eea028e8499bbd87c48 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 6fc08bbefd8c5b72893e7a85b6bb9e3d34454251 (diff) | |
| parent | e5c71c69901ff165e8cceb06fe10b0882e5f8635 (diff) | |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours am: e5c71c6990 -s ours
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293
Change-Id: I874caef974f281ce6f0799aaeb31c2a0cda9c6fc
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions