OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 24 Apr 2017 18:56:31 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Apr 2017 18:56:31 +0000 (18:56 +0000)
commit8a1f704d21e0bb5e810c8ddc4c830fe9a8c7b1bf
treeaa3531c077a50407f6773922c963d6a44ffc5612
parent0c31248456dbe98f8f506a610266da9639e9f41c
parent52a5544db41867cdf4a61a7b6515e6f7bd9d9f25
Merge remote-tracking branch 'toybox/master' into HEAD
am: 52a5544db4

Change-Id: I85e6fee0cf60c1daf18ea022c827f40dfb19faea