OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a am: 0a2465b7db
authorRob Landley <rob@landley.net>
Fri, 27 May 2016 22:31:15 +0000 (22:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 22:31:15 +0000 (22:31 +0000)
commit6d6f104bb281af186ef303bc7af981d167beec03
tree34a9cc42da977333e167483c31cc2824a44a3dfe
parent640c78cd4d05eff7370ec4028d1728e6dfb150fc
parente08318d24bea5e12bf5bc71b5e58f8d72cec8f6f
Merge remote-tracking branch \'toybox/master\' into HEAD am: 1c046ba85a am: 0a2465b7db
am: e08318d24b

* commit 'e08318d24bea5e12bf5bc71b5e58f8d72cec8f6f':
  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: I7911c2df4e3abb806f2bda86e627b8894994f89a