OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 0fcfdec760 am: cfc9d622f1...
authorElliott Hughes <enh@google.com>
Fri, 30 Dec 2016 01:53:27 +0000 (01:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 30 Dec 2016 01:53:27 +0000 (01:53 +0000)
commit026d67e219803fe49f2fd96abf73c81bd9c9ac22
tree267de5df10916a88ecb1268abe0a0b0be30b4c0c
parenta0ea3d16a81160d6f6f4838af61ddbe26112364b
parent5e5180f9ffe103d44283b324ccb8d485d76fb0ae
Merge remote-tracking branch 'toybox/master' into HEAD am: 0fcfdec760 am: cfc9d622f1 am: 9e1692d379
am: 5e5180f9ff

Change-Id: I517a8ad1465bcc2a198e6000e32e41149d9b1050