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:09 +0000 (05:44 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 9 Nov 2017 05:44:09 +0000 (05:44 +0000)
Change-Id: I61388ab9620f684377d5eb06df4ccf591553f9b6


Trivial merge