| commit | 69d46fa9b752c300ea1eb6d506ec046225bf8fe5 | [log] [tgz] |
|---|---|---|
| author | Li Li <dualli@google.com> | Fri Jul 30 17:07:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 30 17:07:55 2021 +0000 |
| tree | 7fe7c9bff8243cc5f720d090adc86caf97edab2f | |
| parent | 839c295eb73ecaec553b977b0cbf426453f88dc8 [diff] | |
| parent | 57240b0a6776d9bca3f9dbfe5baae00364d3bd81 [diff] |
Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b75 am: 57240b0a67 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534 Change-Id: I8605df085ec636ea1dba1096076bee5c1d6dd4f4