OSDN Git Service

Merge cherrypicks of [3035013, 3035015, 3035020, 3035060] into oc-m2-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 9 Oct 2017 19:43:57 +0000 (19:43 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Mon, 9 Oct 2017 19:43:57 +0000 (19:43 +0000)
Change-Id: I26f1034118fcd5a4b0842a2845ce8d1ee9776409


Trivial merge