OSDN Git Service

Merge cherrypicks of [3122088, 3121430, 3119129, 3119130, 3119131, 3120667] into...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 25 Oct 2017 05:31:54 +0000 (05:31 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 25 Oct 2017 05:31:54 +0000 (05:31 +0000)
Change-Id: I4e98e0a22dc691d28d34d50205ffb38d68a6934c


Trivial merge