OSDN Git Service

Merge cherrypicks of [3365569, 3365570, 3366860, 3366878, 3365571, 3365572, 3366918...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 14 Dec 2017 21:21:44 +0000 (21:21 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 14 Dec 2017 21:21:44 +0000 (21:21 +0000)
Change-Id: Ia28588d70733a5ae7de4576c2a6cd81ab328ef34


Trivial merge