OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: f353b240a5 am: 66859184e5
authorElliott Hughes <enh@google.com>
Mon, 19 Jun 2017 22:56:02 +0000 (22:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 22:56:02 +0000 (22:56 +0000)
am: 86fb74fe51

Change-Id: I915bb8c5ee24107acedc88cca27a5bd7da9dfa86


Trivial merge