OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 10d4b07439
authorElliott Hughes <enh@google.com>
Wed, 22 Mar 2017 19:51:23 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Mar 2017 19:51:23 +0000 (19:51 +0000)
commit0f1b43e9bc3a0cf2746adf5b4814cdb6b6b5c44f
tree97b159e95b15cc13dffe6cf92564f2318bfa06f9
parentb4e8d532b0de9b83c0e2d04aee74355df518acc1
parentd0b6ac39977726593f8592905c2a80198f347907
Merge remote-tracking branch 'toybox/master' into HEAD am: 10d4b07439
am: d0b6ac3997

Change-Id: Ib10d4bcdfd7f5355c63dd90272682245264ba021