OSDN Git Service

Merge cherrypicks of [2419615, 2419671, 2419656, 2419633, 2419709, 2419634, 2419635...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 16 Jun 2017 17:21:50 +0000 (17:21 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 16 Jun 2017 17:21:50 +0000 (17:21 +0000)
Change-Id: I8ad2f36ffeb8ead54643cf3d7707099f422df47c


Trivial merge