OSDN Git Service

Merge cherrypicks of [3196053, 3195996, 3195997, 3195998, 3196073, 3196093, 3196113...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 9 Nov 2017 05:44:32 +0000 (05:44 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 9 Nov 2017 05:44:32 +0000 (05:44 +0000)
Change-Id: I95acbaa82a1bc595d122bab54fb7a4e25e37d4ff


Trivial merge