OSDN Git Service

Merge cherrypicks of [2463695, 2463745, 2463732, 2463679, 2463844, 2463803, 2463746...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 27 Jun 2017 06:00:59 +0000 (06:00 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 27 Jun 2017 06:00:59 +0000 (06:00 +0000)
Change-Id: I07af11f2951107cfd86a242f293eb81437c42955


Trivial merge