diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-09 19:52:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-09 19:52:28 +0000 |
| commit | 3ec5783f20e3e2b10d61406cff11a738e7007eb9 (patch) | |
| tree | e59ac2f1a7a7b6b08cf18eea028e8499bbd87c48 /tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp | |
| parent | 92a042d66a92701e4253a7f476141b8558d59862 (diff) | |
| parent | 648b6b5dd4e0d1d3d722027a764a63b2c8f3e4c3 (diff) | |
[automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours am: 648b6b5dd4 -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/+/14673293
Change-Id: I6811a045f3c856c27e305b0a8f9c0c5f43a1e7e6
Diffstat (limited to 'tests/DynamicCodeLoggerIntegrationTests/src/cpp/test_executable.cpp')
0 files changed, 0 insertions, 0 deletions