OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 26 Jan 2017 06:52:26 +0000 (06:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 06:52:26 +0000 (06:52 +0000)
commit49859ac04323a64095c741c689d03947c1104a7b
treee71f8c3dadf7e9a2e5adcef504879c24f82abd9f
parentb3174baf1e5b0a190ef0cb22c33ce698a7672a91
parentcae4495189d228cd8938ce51c8c771502b053ef1
Merge remote-tracking branch 'toybox/master' into HEAD
am: cae4495189

Change-Id: I55523be9cfcc8f135549fce7bd11bbe05ac0b5ed