OSDN Git Service

Merge cherrypicks of [4195294, 4195296, 4195440, 4195441, 4186165, 4186166, 4186580...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 25 May 2018 18:42:25 +0000 (18:42 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 25 May 2018 18:42:25 +0000 (18:42 +0000)
Change-Id: I7dfd4ea22fb57dc5742f3bf46b72d8efe6adbe99


Trivial merge