OSDN Git Service

Merge cherrypicks of [3166006, 3165952, 3164925, 3164926, 3164927, 3164928, 3167313...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 3 Nov 2017 19:55:59 +0000 (19:55 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 3 Nov 2017 19:55:59 +0000 (19:55 +0000)
Change-Id: I021f1a3719f16c3ea2e9b47d3a5c039f5a83a1ca


Trivial merge