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:07:44 +0000 (21:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 29 Jan 2017 21:07:44 +0000 (21:07 +0000)
am: c02f8efaa4

Change-Id: I34833824fc8a61878664e9d73ea3053d0d6d2798


Trivial merge