OSDN Git Service

Merge cherrypicks of [3156476, 3155698, 3156194, 3156639, 3156018, 3156477, 3156098...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 2 Nov 2017 04:50:45 +0000 (04:50 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 2 Nov 2017 04:50:45 +0000 (04:50 +0000)
Change-Id: I107302823b3d3d6a219bdf2caa8909e185ae227a


Trivial merge