OSDN Git Service

Merge cherrypicks of [2481491, 2481800, 2481782, 2481665, 2481547, 2481358, 2481802...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 30 Jun 2017 04:10:12 +0000 (04:10 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 30 Jun 2017 04:10:12 +0000 (04:10 +0000)
Change-Id: Ie9bbb629b1cc534f289d3bb3e649cc4e0c0f0c97


Trivial merge