OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD am: 7a49753b15 am: b3174baf1e
authorElliott Hughes <enh@google.com>
Sun, 15 Jan 2017 21:44:22 +0000 (21:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 15 Jan 2017 21:44:22 +0000 (21:44 +0000)
am: a2af2d6119

Change-Id: Ia87733eae7732e8d73a42ce1104bf11bffa88b12


Trivial merge