OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 11 Jul 2016 20:46:56 +0000 (20:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jul 2016 20:46:56 +0000 (20:46 +0000)
am: 5bb7e2581e

Change-Id: Ic0c5750b789c9aedad09ef64fbd7e0da88903fd7


Trivial merge