OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 991623dec1
authorElliott Hughes <enh@google.com>
Wed, 26 Oct 2016 17:05:05 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Oct 2016 17:05:05 +0000 (17:05 +0000)
am: 7d37c6e2ff

Change-Id: I9f26b6854b1a09638d3effc21b520dad8d921ebb


Trivial merge