OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 10d4b07439
authorElliott Hughes <enh@google.com>
Wed, 22 Mar 2017 19:51:23 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Mar 2017 19:51:23 +0000 (19:51 +0000)
am: d0b6ac3997

Change-Id: Ib10d4bcdfd7f5355c63dd90272682245264ba021


Trivial merge