OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: a379d5ee15 am: a4f4fa78eb
authorElliott Hughes <enh@google.com>
Wed, 5 Jul 2017 19:51:55 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jul 2017 19:51:55 +0000 (19:51 +0000)
am: cb13c3da93

Change-Id: I627d5f6fa77e1083ea1167ff8179c94c3046918e


Trivial merge