OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: fe3d63b269 am: 21b59f15b6
authorElliott Hughes <enh@google.com>
Fri, 2 Jun 2017 21:40:02 +0000 (21:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Jun 2017 21:40:02 +0000 (21:40 +0000)
am: 3622386f99

Change-Id: Iee1ef5cb9ebea90fde424529700c23fb45651092


Trivial merge