OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 7cfb1c6aab am: b8ab605cff
authorElliott Hughes <enh@google.com>
Sun, 29 Jan 2017 21:05:45 +0000 (21:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 29 Jan 2017 21:05:45 +0000 (21:05 +0000)
am: 95049d0f73

Change-Id: I47fd0774c077c12ec30126f081c142bf5e40aabb


Trivial merge