OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 24 Mar 2017 16:57:43 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 24 Mar 2017 16:57:43 +0000 (16:57 +0000)
commitdf46ccd5740fb8f74ebb3b363d7c04a30f7cefbc
tree442e2a4df285a5ec439a39ab3351b2d86e953f11
parentde3d22487aa1e8dc264ddb0fa30550f7a9bc87cf
parentf6e803dd5c9fb472843806566ef85eebbaa94cd8
Merge remote-tracking branch 'toybox/master' into HEAD
am: f6e803dd5c

Change-Id: I77b0ed43d8309eadd39cf63ea4b4e5e23cb37fe0