OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: ddc2344ff9 am: e4c2dbe458...
authorElliott Hughes <enh@google.com>
Tue, 11 Apr 2017 20:31:12 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 20:31:12 +0000 (20:31 +0000)
commit958d734bdc2f1dee1d46d8fb9ff4428626c81ee9
treeaf7bd022c8f8d56393aa33bd95eb7602113d7756
parent86c9466382284510980a8fb00702f949af0e739a
parentc1dcadc0f72fb69cdc1af8cc21faeb747bfedae8
Merge remote-tracking branch 'toybox/master' into HEAD am: ddc2344ff9 am: e4c2dbe458 am: 6825a904c1
am: c1dcadc0f7

Change-Id: Icbd34a18647fda22d0239f5d20e661b33faf89cd