From: Rob Landley <rob@landley.net>
Date: Wed, 25 May 2016 21:20:00 +0000 (+0000)
Subject: Merge remote-tracking branch \'toybox/master\' into HEAD
X-Git-Tag: android-x86-7.1-r1~6^2~26^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=afd5761e898130744d19e3d2960f72295478d70f;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \'toybox/master\' into HEAD
am: b5b37acaac

* commit 'b5b37acaac3661ee9fabbf3cc4ab5026cd534f41':
  The "show parent command path" commit changed the criteria for active nodes, and the collate logic wasn't updated. (Oops.)

Change-Id: Ib0a3a91d79f05175bac63ef1ff423f5e1df86c6d
---

afd5761e898130744d19e3d2960f72295478d70f