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