Skip to content
Commit e3dec870 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: f97b1dec am: 21962a65

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

Change-Id: I24369fcac8ee05245a6c4486f1f59bdbb298fbbc
parents 56dc1ace 21962a65
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