Skip to content
Commit 69d46fa9 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 am: 57240b0a 

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

Change-Id: I8605df085ec636ea1dba1096076bee5c1d6dd4f4
parents 839c295e 57240b0a
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