OSDN Git Service

Merge cherrypicks of [2380642, 2380573, 2380555, 2380535, 2380681, 2380646, 2380457...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 8 Jun 2017 21:29:35 +0000 (21:29 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 8 Jun 2017 21:29:35 +0000 (21:29 +0000)
Change-Id: I843a47e4528058da2a98efdee610a258fd583566


Trivial merge