OSDN Git Service

Merge cherrypicks of [2836977, 2836171, 2836172, 2836173, 2836174, 2836978, 2836979...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 1 Sep 2017 22:09:51 +0000 (22:09 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 1 Sep 2017 22:09:51 +0000 (22:09 +0000)
Change-Id: Ie99eaf8b30bc3346e9a6081eee57d3a9b920d41f


Trivial merge