OSDN Git Service

Merge cherrypicks of [3478016, 3477857, 3477909, 3478630, 3478631, 3478556, 3478557...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 Jan 2018 19:43:05 +0000 (19:43 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 Jan 2018 19:43:05 +0000 (19:43 +0000)
Change-Id: Ibde56eac68c3bf0ea5262b1db52d048d42ad71e7


Trivial merge