OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 3f4a99df44 am: e81bf45656
authorElliott Hughes <enh@google.com>
Sat, 22 Jul 2017 01:30:02 +0000 (01:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 01:30:02 +0000 (01:30 +0000)
am: 84a7c0bc55

Change-Id: Idb7bef292e1c9d37e8d6fd09877e8842c7d3e5c7


Trivial merge