OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: d716ba6533 am: 5e4ff06a52
authorElliott Hughes <enh@google.com>
Thu, 15 Sep 2016 17:09:07 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 17:09:07 +0000 (17:09 +0000)
am: 0c9ddc93d9

Change-Id: I1179cfba6e0da84670de99d4ebdcd498d1b5afe6


Trivial merge