OSDN Git Service

Merge cherrypicks of [2278225, 2279882, 2279862, 2278226, 2277057, 2279863, 2278227...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 May 2017 00:55:40 +0000 (00:55 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 18 May 2017 00:55:40 +0000 (00:55 +0000)
Change-Id: I1823477516e3ccbe0ed20238b243765647417241


Trivial merge