OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e
authorElliott Hughes <enh@google.com>
Fri, 6 May 2016 20:09:55 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 20:09:55 +0000 (20:09 +0000)
commit7bdecc3b26d4f89aace94736acd95c03e894130b
tree2a0908ddb55957a20ec920165f2bfdc5b3020da6
parent2a14db897cee57e35c79cc34ebd31845373f75b4
parenta1f82e90c421498ce800c36aa17b3c5a30b6eea0
Merge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e
am: a1f82e90c4

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

Change-Id: I939d6447e08a9d48f9b4d9bcc06c7d53831ade99