OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 4cce9b0f49 am: b70edb5cc9...
authorElliott Hughes <enh@google.com>
Thu, 29 Sep 2016 22:57:41 +0000 (22:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 22:57:41 +0000 (22:57 +0000)
am: dac6204c3b

Change-Id: If377d3eb6b1c928135292a3112894e4050db2213


Trivial merge