OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: a0637cef8f am: e9452d6abe
authorElliott Hughes <enh@google.com>
Mon, 22 Aug 2016 21:17:28 +0000 (21:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 21:17:28 +0000 (21:17 +0000)
am: 5788fc59e6

Change-Id: I82583191a17b4dc8e49c9c29d4da2c0fdaa7f86e


Trivial merge