| commit | d7306136e84fe382c1f686c3b87d59de41873c7b | [log] [tgz] |
|---|---|---|
| author | Li Li <dualli@google.com> | Fri Jul 30 17:03:54 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 30 17:03:54 2021 +0000 |
| tree | 6cdbf48d94d14a96a507c729aed8a6c0a7185d69 | |
| parent | efc97e3688295d928bac9f76eb5d433623eb8f7f [diff] | |
| parent | d2aeb490a85f056c4f7282ed2f3717a0e162071b [diff] |
Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 am: d2aeb490a8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534 Change-Id: Ica77c69580dd69bed4e260779c1f7318307282b1