OSDN Git Service

Merge cherrypicks of [2905832, 2906321, 2905732, 2906078, 2905510, 2905511, 2905512...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 15 Sep 2017 05:52:57 +0000 (05:52 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 15 Sep 2017 05:52:57 +0000 (05:52 +0000)
Change-Id: Iaafc56b6c1bcea605cfd039bd73c4beadf7c9520


Trivial merge