OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a
authorElliott Hughes <enh@google.com>
Fri, 27 May 2016 22:26:47 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 22:26:47 +0000 (22:26 +0000)
commite08318d24bea5e12bf5bc71b5e58f8d72cec8f6f
tree34a9cc42da977333e167483c31cc2824a44a3dfe
parent9bf37a0686523c0f04d6091a67cfa75b3307aa45
parent0a2465b7dbd911e4745af51f691b7618ff43b1e8
Merge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a
am: 0a2465b7db

* commit '0a2465b7dbd911e4745af51f691b7618ff43b1e8':
  Add -o TNAME for android, fix display of last field (retain left justifification when trimmed for screen width), make ARGS path trimming logic work with spaces in path.
  Stabilize another sort.
  Stand alone builds of OLDTOY should show help text for corresponding NEWTOY.

Change-Id: Ic0675d535dc0717aef51a9c2a59ce2cd61175146