OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 27 Feb 2017 16:20:19 +0000 (16:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Feb 2017 16:20:19 +0000 (16:20 +0000)
am: 180f3c7f4b

Change-Id: If5cb854b6027d42c7b05b8adc341479f04dce310


Trivial merge