OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sun, 15 Jan 2017 21:35:54 +0000 (21:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 15 Jan 2017 21:35:54 +0000 (21:35 +0000)
commitb3174baf1e5b0a190ef0cb22c33ce698a7672a91
tree333fe5cbf01ed49ae7f544c8d3c5e8f1945a5bf0
parentcfc9d622f1bd28642728bed8d7328ddd9449dcc9
parent7a49753b15c998ec82851a7a7f4eb4d9ac67c7d8
Merge remote-tracking branch 'toybox/master' into HEAD
am: 7a49753b15

Change-Id: I17361cfd5d1e8add30ebacaa5cac87a304e0f716