OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorRob Landley <rob@landley.net>
Wed, 25 May 2016 21:20:00 +0000 (21:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 21:20:00 +0000 (21:20 +0000)
commitafd5761e898130744d19e3d2960f72295478d70f
treec719c255ad2f03a3ae1a291e449fb44a46d4e1e2
parent046214fe5a2d4ebcdfe64f14ae69b156e357c437
parentb5b37acaac3661ee9fabbf3cc4ab5026cd534f41
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