OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 5d83f7a6f9
authorElliott Hughes <enh@google.com>
Mon, 29 Aug 2016 16:07:53 +0000 (16:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Aug 2016 16:07:53 +0000 (16:07 +0000)
am: acc11f0720

Change-Id: I5576d6330cfe52c565187cd5e035f028c25c1162


Trivial merge