OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: c5a1dd459a
authorElliott Hughes <enh@google.com>
Tue, 2 May 2017 22:03:23 +0000 (22:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 22:03:23 +0000 (22:03 +0000)
am: e71581dbbc

Change-Id: Ibee2b9d8160f87deb1c0f0581ab219b032f505b7


Trivial merge