OSDN Git Service

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

Change-Id: I4f9709b23aeeb6ba80d1b0ccbce921e3b7054744


Trivial merge