OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 4cce9b0f49 am: b70edb5cc9
authorElliott Hughes <enh@google.com>
Thu, 29 Sep 2016 22:53:26 +0000 (22:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 22:53:26 +0000 (22:53 +0000)
am: e61df5503f

Change-Id: Ia22bdc60961bedb040de4c8b6c8dca576e58b4cd


Trivial merge