OSDN Git Service

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 0803f535c0
authorElliott Hughes <enh@google.com>
Wed, 22 Jun 2016 18:28:39 +0000 (18:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 18:28:39 +0000 (18:28 +0000)
am: 092461d02d

Change-Id: I248376888406a9beef0266bbc19a16c34c12a934


Trivial merge