OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 4ab83f6960
authorElliott Hughes <enh@google.com>
Tue, 21 Feb 2017 19:31:47 +0000 (19:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 19:31:47 +0000 (19:31 +0000)
commitca45906d42140e38a25cde773d9cd4998c1670e5
tree6d666741d64250067cfa7a9bb3dcb7a71829ba41
parentfc53766b1900dc7af5a6f64582e22e5846350835
parentf3cea5c2a8182fe5acc4ac1b39c7fa10bc05470d
Merge remote-tracking branch 'toybox/master' into HEAD am: 4ab83f6960
am: f3cea5c2a8

Change-Id: I2e5e4c0d0d044545b7e335dadbe57823e641b6ac