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:17:39 +0000 (17:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 17:17:39 +0000 (17:17 +0000)
am: ab068b6195

Change-Id: I5e97ab82374efbb634c8b6f360079103cec376f9


Trivial merge