OSDN Git Service

Merge cherrypicks of [4787660, 4787680, 4787071, 4787700, 4787592, 4787701, 4787720...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 16 Aug 2018 01:24:44 +0000 (01:24 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 16 Aug 2018 01:24:44 +0000 (01:24 +0000)
Change-Id: I38f40dabd3b571920f41b122978558e0eac4d060


Trivial merge