OSDN Git Service

Merge cherrypicks of [2331583, 2331644, 2331627, 2331663, 2331664] into oc-release
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 30 May 2017 20:58:51 +0000 (20:58 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 30 May 2017 20:58:51 +0000 (20:58 +0000)
Change-Id: I7bef8edbaaf0d8b0fd8bf1be1fe2735424f0b192


Trivial merge