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