OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac
authorElliott Hughes <enh@google.com>
Wed, 25 May 2016 21:26:06 +0000 (21:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 21:26:06 +0000 (21:26 +0000)
commite0a437e83cc988274890589fd5d0c8146830403e
treec719c255ad2f03a3ae1a291e449fb44a46d4e1e2
parented5ef3604838d4f14de5f3615a314d1cd81129a6
parentafd5761e898130744d19e3d2960f72295478d70f
Merge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac
am: afd5761e89

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

Change-Id: Icff8308b066d65d51ec9c915f8fe226334d3ae68