OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorAlistair Strachan <alistair.strachan@imgtec.com>
Fri, 6 May 2016 20:05:13 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 20:05:13 +0000 (20:05 +0000)
commita1f82e90c421498ce800c36aa17b3c5a30b6eea0
tree2a0908ddb55957a20ec920165f2bfdc5b3020da6
parent90ed87b8c123fd0e6b8e2be8ac7137e7f3f60c61
parent93eb0e019e298939867733b9fd831a51f65b1872
Merge remote-tracking branch \'toybox/master\' into HEAD
am: 93eb0e019e

* commit '93eb0e019e298939867733b9fd831a51f65b1872':
  Fix static linkage of toybox binary.
  Add top -H.
  Android roadmap update.

Change-Id: I34da7d5e50fd36d07fa5d935cbdb2956cce98c1c