OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 15 Sep 2016 17:03:06 +0000 (17:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Sep 2016 17:03:06 +0000 (17:03 +0000)
commit5e4ff06a52aa8d6eb99c54ba44c2fd13d9051a23
tree4282f49beb56ed2c2eeb14e7c934410f79066613
parentb11a72dc2d563e3a78a5931db646b2742c12be7c
parentd716ba6533ad7b8b5c1164b8b8cb537168eaee8a
Merge remote-tracking branch 'toybox/master' into HEAD
am: d716ba6533

Change-Id: I429e855c09e75bea305fc94048f8e4c7b772b0a1