OSDN Git Service

Merge cherrypicks of [3167492, 3168293, 3168294, 3168295, 3168296, 3168297, 3168298...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 3 Nov 2017 22:26:02 +0000 (22:26 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 3 Nov 2017 22:26:02 +0000 (22:26 +0000)
Change-Id: I80d07cfe8f43a7b4ba195b2f9c78183743ce3bb8


Trivial merge