OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 3233e2f9c1
authorElliott Hughes <enh@google.com>
Thu, 25 May 2017 23:45:29 +0000 (23:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 May 2017 23:45:29 +0000 (23:45 +0000)
am: 5aa96f14c1

Change-Id: I3ecf7f93f6eab051b753c65952f801c5645ac8c4


Trivial merge