OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 29 Sep 2016 22:24:35 +0000 (22:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Sep 2016 22:24:35 +0000 (22:24 +0000)
commitb70edb5cc9e047ba696b553fbc5ef43eb543e6ad
tree21dd1a35e15605970d0c6ec6decbaa613f8a9164
parent2c4dc7733bd8c585ad3e94d4189efd4022e810d6
parent4cce9b0f49ab49e1eb946101d6a1ed2d08353e20
Merge remote-tracking branch 'toybox/master' into HEAD
am: 4cce9b0f49

Change-Id: I1af124e0e82203f86a950a24d336886322dd8f3d