From: Colin Cross <ccross@android.com>
Date: Wed, 5 Oct 2016 01:44:35 +0000 (+0000)
Subject: Merge "Revert "Compute PPID at ninja time"" am: 3601e4a5c5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c907acaad19da90c00ae57879828629a2f383db8;p=android-x86%2Fart.git

Merge "Revert "Compute PPID at ninja time"" am: 3601e4a5c5
am: 84a7962b88

Change-Id: I57b37702b9138714a474b1e2a3d1e32bed4e6eec
---

c907acaad19da90c00ae57879828629a2f383db8