OSDN Git Service

Merge cherrypicks of [2374621, 2374525, 2374320, 2374526, 2374587, 2374550, 2374624...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 8 Jun 2017 00:36:52 +0000 (00:36 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 8 Jun 2017 00:36:52 +0000 (00:36 +0000)
Change-Id: I98bcc6d4b6dd25b99bc55244c9a04e0da54d1b73


Trivial merge