Skip to content
Commit f97b1dec 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: ef12967b 

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

Change-Id: I997b46822bd83f9c9f7dc6a02e9514a95b3758a1
parents 256d0fc4 ef12967b
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