From: Hans Boehm <hboehm@google.com>
Date: Tue, 9 Jan 2018 19:38:55 +0000 (+0000)
Subject: Merge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2
X-Git-Tag: android-x86-9.0-r1~269^2~4^2~12
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f81791c14112ddf7d23ba49d8ba396605917b7cf;p=android-x86%2Fframeworks-base.git

Merge "Only count uncleared ProxyMap refs when deciding to crash" am: 90027eb1c2
am: c9e7c10afb

Change-Id: I70169c5eeb5dbdaa751ea7b9369feb3663d79952
---

f81791c14112ddf7d23ba49d8ba396605917b7cf