OSDN Git Service

Merge cherrypicks of [2476230, 2476289, 2476272, 2476118, 2475997, 2476251, 2476119...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 29 Jun 2017 04:44:51 +0000 (04:44 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Thu, 29 Jun 2017 04:44:51 +0000 (04:44 +0000)
Change-Id: I3e45afab5b6c2e2a29e60638c33d090b368c4424


Trivial merge