OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Wed, 22 Mar 2017 19:48:54 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Mar 2017 19:48:54 +0000 (19:48 +0000)
am: 10d4b07439

Change-Id: I710d2f32c2ed213fdc6a9a64bdab2f8daf66c734


Trivial merge