OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: d2ed825752
authorElliott Hughes <enh@google.com>
Tue, 29 Nov 2016 16:31:33 +0000 (16:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 16:31:33 +0000 (16:31 +0000)
am: 59b7525e7e

Change-Id: Ie4e8169296809996e3064ff0ba1c3f528a04d9cb


Trivial merge