Skip to content
Commit 56dc1ace authored by Li Li's avatar Li Li Committed by Automerger Merge Worker
Browse files

Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am:... 

Merge "Freezer: fix exception when parsing /proc/locks" into sc-dev am: ef12967b am: d2aeb490 am: d7306136

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15395534

Change-Id: I3fcc4b396ab93e0bec9bb8a68c37e05d7ca85e40
parents 66b936d9 d7306136
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment