OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 5d83f7a6f9 am: acc11f0720
authorElliott Hughes <enh@google.com>
Mon, 29 Aug 2016 16:10:53 +0000 (16:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 29 Aug 2016 16:10:53 +0000 (16:10 +0000)
am: c3ffd8fc51

Change-Id: I0b55c1fe4ec820640957f53257e69ae6ccfac814


Trivial merge