OSDN Git Service

(root) / android-x86 / external-toybox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bff213 e0a437e)
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)
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


Trivial merge
external/toybox
About OSDN
Find Software
Develop Software
Help