OSDN Git Service

Merge cherrypicks of [2973982, 2974657, 2974658, 2973983, 2973984, 2974689, 2974690...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 28 Sep 2017 17:16:57 +0000 (17:16 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 28 Sep 2017 17:16:57 +0000 (17:16 +0000)
Change-Id: I0d33346d338c50065825f52a47a1c09c4a27a4c6


Trivial merge