OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac am: afd5761e89
authorRob Landley <rob@landley.net>
Wed, 25 May 2016 21:37:57 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 21:37:57 +0000 (21:37 +0000)
commit1317487788889aea4b49d9f0b6fc919f2acac7d7
treec719c255ad2f03a3ae1a291e449fb44a46d4e1e2
parent1bff213a5fa0e3f1cbdd11c2d2dc58e6998eb295
parente0a437e83cc988274890589fd5d0c8146830403e
Merge remote-tracking branch \'toybox/master\' into HEAD am: b5b37acaac am: afd5761e89
am: e0a437e83c

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

Change-Id: I84710826975f03e4533c235906e4195ec47eb99e