OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: d2ed825752
authorElliott Hughes <enh@google.com>
Tue, 29 Nov 2016 16:31:33 +0000 (16:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 16:31:33 +0000 (16:31 +0000)
commit6c39691c66cc76b82320bb2e5b34af1c9bd961bd
tree2ada51ac481cea48842a6c64b0975e576eca31a9
parent0d4acb353d771aa8444b73ca0682ea96e34c7470
parent59b7525e7eca8ca3f5566e56e726db8d2a738aaf
Merge remote-tracking branch 'toybox/master' into HEAD am: d2ed825752
am: 59b7525e7e

Change-Id: Ie4e8169296809996e3064ff0ba1c3f528a04d9cb